merge

src/control/Script.cpp

@@ -725,25 +725,17 @@ void CRunningScript::Init()
 }
 
 #ifdef USE_DEBUG_SCRIPT_LOADER
-int scriptToLoad = 0;
+int CTheScripts::ScriptToLoad = 0;
-const char *scriptfile = "main.scm";
 
-int open_script()
+int CTheScripts::OpenScript()
 {
-	// glfwGetKey doesn't work because of CGame::Initialise is blocking 
+	CFileMgr::ChangeDir("\\");
-	CPad::UpdatePads();
+	switch (ScriptToLoad) {
-	if (CPad::GetPad(0)->GetChar('G'))
+	case 0: return CFileMgr::OpenFile("data\\main.scm", "rb");
-		scriptToLoad = 0;
+	case 1: return CFileMgr::OpenFile("data\\freeroam_miami.scm", "rb");
-	if (CPad::GetPad(0)->GetChar('R'))
+	case 2: return CFileMgr::OpenFile("data\\main_d.scm", "rb");
-		scriptToLoad = 1;
-	if (CPad::GetPad(0)->GetChar('D'))
-		scriptToLoad = 2;
-	switch (scriptToLoad) {
-	case 0: scriptfile = "main.scm"; break;
-	case 1: scriptfile = "freeroam_miami.scm"; break;
-	case 2: scriptfile = "main_d.scm"; break;
 	}
-	return CFileMgr::OpenFile(scriptfile, "rb");
+	return CFileMgr::OpenFile("data\\main.scm", "rb");
 }
 #endif
 
@@ -759,10 +751,16 @@ void CTheScripts::Init()
 	MissionCleanUp.Init();
 	UpsideDownCars.Init();
 	StuckCars.Init();
-	CFileMgr::SetDir("data");
 #ifdef USE_DEBUG_SCRIPT_LOADER
-	int mainf = open_script();
+	// glfwGetKey doesn't work because of CGame::Initialise is blocking
+	CPad::UpdatePads();
+	if(CPad::GetPad(0)->GetChar('G')) ScriptToLoad = 0;
+	if(CPad::GetPad(0)->GetChar('R')) ScriptToLoad = 1;
+	if(CPad::GetPad(0)->GetChar('D')) ScriptToLoad = 2;
+
+	int mainf = OpenScript();
 #else
+	CFileMgr::SetDir("data");
 	int mainf = CFileMgr::OpenFile("main.scm", "rb");
 #endif
 	CFileMgr::Read(mainf, (char*)ScriptSpace, SIZE_MAIN_SCRIPT);
@@ -903,24 +901,24 @@ void CTheScripts::Process()
 	static uint32 TimeToWaitTill;
 	static bool AlreadyResetHealth;
 	switch (AllowMissionReplay) {
-	case 2:
+	case MISSION_RETRY_STAGE_START_PROCESSING:
-		AllowMissionReplay = 3;
+		AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_DELAY;
 		TimeToWaitTill = CTimer::GetTimeInMilliseconds() + (AddExtraDeathDelay() > 1000 ? 4000 : 2500);
 		break;
-	case 3:
+	case MISSION_RETRY_STAGE_WAIT_FOR_DELAY:
 		if (TimeToWaitTill < CTimer::GetTimeInMilliseconds())
-			AllowMissionReplay = 4;
+			AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_MENU;
 		break;
-	case 4:
+	case MISSION_RETRY_STAGE_WAIT_FOR_MENU:
-		AllowMissionReplay = 5;
+		AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_USER;
 		RetryMission(0, 0);
 		break;
-	case 6:
+	case MISSION_RETRY_STAGE_START_RESTARTING:
-		AllowMissionReplay = 7;
+		AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART;
 		AlreadyResetHealth = false;
 		TimeToWaitTill = CTimer::GetTimeInMilliseconds() + 500;
 		break;
-	case 7:
+	case MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART:
 		if (!AlreadyResetHealth) {
 			AlreadyResetHealth = true;
 			CPlayerPed* pPlayerPed = FindPlayerPed();
@@ -931,7 +929,7 @@ void CTheScripts::Process()
 			}
 		}
 		if (TimeToWaitTill < CTimer::GetTimeInMilliseconds()) {
-			AllowMissionReplay = 0;
+			AllowMissionReplay = MISSION_RETRY_STAGE_NORMAL;
 			return;
 		}
 		break;
@@ -1554,11 +1552,11 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 			CPlayerInfo* pPlayerInfo = &CWorld::Players[CWorld::PlayerInFocus];
 #if 0 // makeing autosave is pointless and is a bit buggy
 			if (pPlayerInfo->m_pPed->GetPedState() != PED_DEAD && pPlayerInfo->m_WBState == WBSTATE_PLAYING && !m_bDeatharrestExecuted)
-				SaveGameForPause(1);
+				SaveGameForPause(SAVE_TYPE_QUICKSAVE);
 #endif
 			oldTargetX = oldTargetY = 0.0f;
-			if (AllowMissionReplay == 1)
+			if (AllowMissionReplay == MISSION_RETRY_STAGE_WAIT_FOR_SCRIPT_TO_TERMINATE)
-				AllowMissionReplay = 2;
+				AllowMissionReplay = MISSION_RETRY_STAGE_START_PROCESSING;
 			// I am fairly sure they forgot to set return value here
 		}
 #endif
@@ -2579,10 +2577,10 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
 #ifdef MISSION_REPLAY
 		if (strcmp((char*)&CTheScripts::ScriptSpace[m_nIp - KEY_LENGTH_IN_SCRIPT], "M_FAIL") == 0) {
-			if (AllowMissionReplay == 7)
+			if (AllowMissionReplay == MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART)
-				AllowMissionReplay = 0;
+				AllowMissionReplay = MISSION_RETRY_STAGE_NORMAL;
 			if (CanAllowMissionReplay())
-				AllowMissionReplay = 1;
+				AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_SCRIPT_TO_TERMINATE;
 		}
 #endif
 		CollectParameters(&m_nIp, 2);
@@ -3229,7 +3227,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 
 bool CRunningScript::CanAllowMissionReplay()
 {
-	if (AllowMissionReplay)
+	if (AllowMissionReplay != MISSION_RETRY_STAGE_NORMAL)
 		return false;
 	for (int i = 0; i < ARRAY_SIZE(MissionScripts); i++) {
 		if (!CGeneral::faststricmp(m_abScriptName, MissionScripts[i]))
@@ -3245,14 +3243,14 @@ uint32 AddExtraDeathDelay()
 
 void RetryMission(int type, int unk)
 {
-	if (type == 0) {
+	if (type == MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER) {
 		doingMissionRetry = true;
 		FrontEndMenuManager.m_nCurrScreen = MENUPAGE_MISSION_RETRY;
 		FrontEndMenuManager.RequestFrontEndStartUp();
 	}
-	else if (type == 2) {
+	else if (type == MISSION_RETRY_TYPE_BEGIN_RESTARTING) {
 		doingMissionRetry = false;
-		AllowMissionReplay = 6;
+		AllowMissionReplay = MISSION_RETRY_STAGE_START_RESTARTING;
 		CTheScripts::MissionCleanUp.Process();
 	}
 }

src/control/Script.h

@@ -47,10 +47,6 @@ void FlushLog();
 
 #define KEY_LENGTH_IN_SCRIPT (8)
 
-#ifdef USE_DEBUG_SCRIPT_LOADER
-extern const char* scriptfile;
-#endif
-
 //#define GTA_SCRIPT_COLLECTIVE
 
 struct intro_script_rectangle 
@@ -593,6 +589,11 @@ public:
 	}
 #endif
 
+#ifdef USE_DEBUG_SCRIPT_LOADER
+	static int ScriptToLoad;
+	static int OpenScript();
+#endif
+
 #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
 	static void LogAfterScriptInitializing();
 	static void LogBeforeScriptProcessing();
@@ -600,9 +601,6 @@ public:
 #endif
 };
 
-#ifdef USE_DEBUG_SCRIPT_LOADER
-extern int scriptToLoad;
-#endif
 #ifdef MISSION_REPLAY
 extern int AllowMissionReplay;
 extern uint32 WaitForMissionActivate;
@@ -621,8 +619,21 @@ extern bool AlreadySavedGame;
 
 uint32 AddExtraDeathDelay();
 void RetryMission(int, int);
-#endif
 
-#ifdef USE_DEBUG_SCRIPT_LOADER
+enum {
-extern int scriptToLoad;
+	MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER = 0,
+	MISSION_RETRY_TYPE_1,
+	MISSION_RETRY_TYPE_BEGIN_RESTARTING
+};
+
+enum {
+	MISSION_RETRY_STAGE_NORMAL = 0,
+	MISSION_RETRY_STAGE_WAIT_FOR_SCRIPT_TO_TERMINATE,
+	MISSION_RETRY_STAGE_START_PROCESSING,
+	MISSION_RETRY_STAGE_WAIT_FOR_DELAY,
+	MISSION_RETRY_STAGE_WAIT_FOR_MENU,
+	MISSION_RETRY_STAGE_WAIT_FOR_USER,
+	MISSION_RETRY_STAGE_START_RESTARTING,
+	MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART,
+};
 #endif

src/control/Script5.cpp

@@ -1380,12 +1380,12 @@ void CRunningScript::DoDeatharrestCheck()
 	if (!pPlayer->IsRestartingAfterDeath() && !pPlayer->IsRestartingAfterArrest())
 		return;
 #ifdef MISSION_REPLAY
-	if (AllowMissionReplay != 7 && AllowMissionReplay != 0)
+	if (AllowMissionReplay != MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART && AllowMissionReplay != MISSION_RETRY_STAGE_NORMAL)
 		return;
-	if (AllowMissionReplay == 7)
+	if (AllowMissionReplay == MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART)
-		AllowMissionReplay = 0;
+		AllowMissionReplay = MISSION_RETRY_STAGE_NORMAL;
 	if (CanAllowMissionReplay())
-		AllowMissionReplay = 1;
+		AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_SCRIPT_TO_TERMINATE;
 #endif
 	script_assert(m_nStackPointer > 0);
 	while (m_nStackPointer > 1)

src/control/Script6.cpp

@@ -381,7 +381,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		if (!UsingMobileScript && CTheScripts::MissionSupportsMissionReplay(missionRetryScriptIndex)){
 			if (!AlreadySavedGame) {
 				m_nIp = oldIp - 2;
-				SaveGameForPause(4);
+				SaveGameForPause(SAVE_TYPE_QUICKSAVE_FOR_SCRIPT);
 				AlreadySavedGame = true;
 				return 0;
 			}
@@ -394,9 +394,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CTimer::Suspend();
 		int offset = CTheScripts::MultiScriptArray[ScriptParams[0]];
 #ifdef USE_DEBUG_SCRIPT_LOADER
-		CFileMgr::ChangeDir("\\data\\");
+		int handle = CTheScripts::OpenScript();
-		int handle = CFileMgr::OpenFile(scriptfile, "rb");
-		CFileMgr::ChangeDir("\\");
 #else
 		CFileMgr::ChangeDir("\\");
 		int handle = CFileMgr::OpenFile("data\\main.scm", "rb");

src/control/ScriptDebug.cpp

@@ -1736,16 +1736,14 @@ CTheScripts::SwitchToMission(int32 mission)
 	missionRetryScriptIndex = mission;
 #ifdef USE_MISSION_REPLAY_OVERRIDE_FOR_NON_MOBILE_SCRIPT
 	if (CTheScripts::MissionSupportsMissionReplay(missionRetryScriptIndex)) {
-		SaveGameForPause(4);
+		SaveGameForPause(SAVE_TYPE_QUICKSAVE_FOR_SCRIPT);
 	}
 #endif
 #endif
 	CTimer::Suspend();
 	int offset = CTheScripts::MultiScriptArray[mission];
 #ifdef USE_DEBUG_SCRIPT_LOADER
-	CFileMgr::ChangeDir("\\data\\");
+	int handle = OpenScript();
-	int handle = CFileMgr::OpenFile(scriptfile, "rb");
-	CFileMgr::ChangeDir("\\");
 #else
 	CFileMgr::ChangeDir("\\");
 	int handle = CFileMgr::OpenFile("data\\main.scm", "rb");

src/core/Frontend.cpp

@@ -4621,7 +4621,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
 #ifdef USE_DEBUG_SCRIPT_LOADER
 	if (m_nCurrScreen == MENUPAGE_START_MENU || m_nCurrScreen == MENUPAGE_NEW_GAME || m_nCurrScreen == MENUPAGE_NEW_GAME_RELOAD) {
 		if (CPad::GetPad(0)->GetChar('R')) {
-			scriptToLoad = 1;
+			CTheScripts::ScriptToLoad = 1;
 			DoSettingsBeforeStartingAGame();
 			return;
 		}
@@ -4776,7 +4776,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
 #ifdef MISSION_REPLAY
 			case MENUACTION_REJECT_RETRY:
 				doingMissionRetry = false;
-				AllowMissionReplay = 0;
+				AllowMissionReplay = MISSION_RETRY_STAGE_NORMAL;
 				RequestFrontEndShutDown();
 				break;
 			case MENUACTION_UNK114:
@@ -5444,7 +5444,7 @@ CMenuManager::ProcessFileActions()
 #endif
 			if (CheckSlotDataValid(m_nCurrSaveSlot)) {
 #ifdef USE_DEBUG_SCRIPT_LOADER
-				scriptToLoad = 0;
+				CTheScripts::ScriptToLoad = 0;
 #endif
 
 #ifdef XBOX_MESSAGE_SCREEN

src/save/GenericGameStorage.cpp

@@ -1176,16 +1176,16 @@ void DisplaySaveResult(int unk, char* name)
 
 bool SaveGameForPause(int type)
 {
-	if (AllowMissionReplay != 0 && AllowMissionReplay != 7) {
+	if (AllowMissionReplay != MISSION_RETRY_STAGE_NORMAL && AllowMissionReplay != MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART) {
 		debug("SaveGameForPause failed during AllowMissionReplay %d", AllowMissionReplay);
 		return false;
 	}
-	if (type != 3 && WaitForSave > CTimer::GetTimeInMilliseconds()) {
+	if (type != SAVE_TYPE_QUICKSAVE_FOR_MISSION_REPLAY && WaitForSave > CTimer::GetTimeInMilliseconds()) {
 		debug("SaveGameForPause failed WaitForSave");
 		return false;
 	}
 	WaitForSave = 0;
-	if (gGameState != GS_PLAYING_GAME || (CTheScripts::bAlreadyRunningAMissionScript && type != 5)) {
+	if (gGameState != GS_PLAYING_GAME || (CTheScripts::bAlreadyRunningAMissionScript && type != SAVE_TYPE_QUICKSAVE_FOR_SCRIPT_ON_A_MISSION)) {
 		DisplaySaveResult(3, CStats::LastMissionPassedName);
 		return false;
 	}

src/save/GenericGameStorage.h

@@ -53,4 +53,14 @@ const char TopLineEmptyFile[] = "THIS FILE IS NOT VALID YET";
 extern int8 IsQuickSave; // originally int
 
 bool SaveGameForPause(int);
+
+enum {
+	SAVE_TYPE_NORMAL,
+	SAVE_TYPE_QUICKSAVE,
+	SAVE_TYPE_2,
+	SAVE_TYPE_QUICKSAVE_FOR_MISSION_REPLAY,
+	SAVE_TYPE_QUICKSAVE_FOR_SCRIPT,
+	SAVE_TYPE_QUICKSAVE_FOR_SCRIPT_ON_A_MISSION
+};
+
 #endif