Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)

src/core/Cam.cpp

@@ -1688,7 +1688,7 @@ CCam::Process_BehindCar(const CVector &CameraTarget, float TargetOrientation, fl
 	if(Length < 0.002f)
 		Length = 0.002f;
 	Beta = CGeneral::GetATanOfXY(TargetCoors.x - Source.x, TargetCoors.y - Source.y);
-#ifdef TOGGLEABLE_BETA_FEATURES
+#if 1
 	// This is completely made up but Bill's cam manipulates an angle before calling this
 	// and otherwise calculating Beta doesn't make much sense.
 	Beta += fBillsBetaOffset;

src/core/Frontend.cpp

@@ -1217,8 +1217,10 @@ CMenuManager::Draw()
 							rightText = option.drawFunc(&isOptionDisabled);
 						}
 					}
-				} else
+				} else {
+					debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu, option.screen, option.screenOptionOrder);
 					assert(0 && "Custom frontend options is borked");
+				}
 
 				break;
 #endif
@@ -4775,8 +4777,10 @@ CMenuManager::ProcessButtonPresses(void)
 						} else if (option.type == FEOPTION_GOBACK) {
 							goBack = true;
 						}
-					} else
+					} else {
+						debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
 						assert(0 && "Custom frontend options are borked");
+					}
 
 					break;
 #endif
@@ -4998,8 +5002,10 @@ CMenuManager::ProcessButtonPresses(void)
 					}
 					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 				}
-				else
+				else {
+					debug("screen:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
 					assert(0 && "Custom frontend options are borked");
+				}
 
 				break;
 #endif

src/core/Wanted.cpp

@@ -161,7 +161,11 @@ CWanted::RegisterCrime(eCrimeType type, const CVector &coors, uint32 id, bool po
 void
 CWanted::RegisterCrime_Immediately(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare)
 {
-	if(!AddCrimeToQ(type, id, coors, false, policeDoesntCare))
+#if defined FIX_SIGNIFICANT_BUGS || defined PEDS_REPORT_CRIMES_ON_PHONE
+	if (!AddCrimeToQ(type, id, coors, true, policeDoesntCare))
+#else
+	if (!AddCrimeToQ(type, id, coors, false, policeDoesntCare))
+#endif
 		ReportCrimeNow(type, coors, policeDoesntCare);
 }
 
@@ -219,6 +223,9 @@ CWanted::ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesnt
 		chaos *= 0.333f;
 	switch(type){
 	case CRIME_POSSESSION_GUN:
+#ifdef PEDS_REPORT_CRIMES_ON_PHONE
+		m_nChaos += 5.0f*chaos;
+#endif
 		break;
 	case CRIME_HIT_PED:
 		m_nChaos += 5.0f*chaos;
@@ -440,6 +447,30 @@ CWanted::Reset(void)
 	Initialise();
 }
 
+#ifdef PEDS_REPORT_CRIMES_ON_PHONE
+bool
+CrimeShouldBeReportedOnPhone(eCrimeType crime)
+{
+	switch (crime) {
+		case CRIME_POSSESSION_GUN:
+		case CRIME_HIT_PED:
+		case CRIME_HIT_COP:
+		case CRIME_SHOOT_PED:
+		case CRIME_SHOOT_COP:
+		case CRIME_STEAL_CAR:
+		case CRIME_RECKLESS_DRIVING:
+		case CRIME_RUNOVER_PED:
+		case CRIME_RUNOVER_COP:
+		case CRIME_PED_BURNED:
+		case CRIME_COP_BURNED:
+		case CRIME_VEHICLE_BURNED:
+			return true;
+		default:
+			return false;
+	}
+}
+#endif
+
 void
 CWanted::UpdateCrimesQ(void)
 {
@@ -447,6 +478,9 @@ CWanted::UpdateCrimesQ(void)
 
 		CCrimeBeingQd &crime = m_aCrimes[i];
 		if (crime.m_nType != CRIME_NONE) {
+#ifdef PEDS_REPORT_CRIMES_ON_PHONE
+			if (!CrimeShouldBeReportedOnPhone(crime.m_nType))
+#endif
 			if (CTimer::GetTimeInMilliseconds() > crime.m_nTime + 500 && !crime.m_bReported) {
 				ReportCrimeNow(crime.m_nType, crime.m_vecPosn, crime.m_bPoliceDoesntCare);
 				crime.m_bReported = true;

src/core/config.h

@@ -190,7 +190,6 @@ enum Config {
 #endif
 
 #define FIX_BUGS		// fixes bugs that we've came across during reversing, TODO: use this more
-#define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
 #define MORE_LANGUAGES		// Add more translations to the game
 #define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
 
@@ -242,7 +241,7 @@ enum Config {
 #	define MISSION_REPLAY // mobile feature
 #endif
 //#define SIMPLIER_MISSIONS // apply simplifications from mobile
-#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+//#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
 #define SCRIPT_LOG_FILE_LEVEL 1 // 0 == no log, 1 == overwrite every frame, 2 == full log
 
 #ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
@@ -267,6 +266,7 @@ enum Config {
 #define VC_PED_PORTS			// various ports from VC's CPed, mostly subtle
 // #define NEW_WALK_AROUND_ALGORITHM	// to make walking around vehicles/objects less awkward
 #define CANCELLABLE_CAR_ENTER
+//#define PEDS_REPORT_CRIMES_ON_PHONE
 
 // Camera
 //#define PS2_CAM_TRANSITION	// old way of transitioning between cam modes

src/core/re3.cpp

@@ -484,11 +484,7 @@ DebugMenuPopulate(void)
 #ifdef CUSTOM_FRONTEND_OPTIONS
 		DebugMenuAddCmd("Debug", "Reload custom frontend options", ReloadFrontendOptions);
 #endif
-#ifdef TOGGLEABLE_BETA_FEATURES
 		DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil);
-		DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", &CPed::bMakePedsRunToPhonesToReportCrimes, nil);
-#endif
-
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
 		DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);