diff options
Diffstat (limited to 'src/control/Script.h')
| -rw-r--r-- | src/control/Script.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/control/Script.h b/src/control/Script.h index 589127e5..bc16c99d 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -49,10 +49,6 @@ void FlushLog(); #define KEY_LENGTH_IN_SCRIPT (8) -#ifdef USE_DEBUG_SCRIPT_LOADER -extern const char* scriptfile; -#endif - //#define GTA_SCRIPT_COLLECTIVE #define GET_INTEGER_PARAM(i) (ScriptParams[i]) #define GET_FLOAT_PARAM(i) (*(float*)&ScriptParams[i]) @@ -674,6 +670,11 @@ public: static bool IsFortStauntonDestroyed() { return FSDestroyedFlag && *(int32*)&ScriptSpace[FSDestroyedFlag] == 1; } +#ifdef USE_DEBUG_SCRIPT_LOADER + static int ScriptToLoad; + static int OpenScript(); +#endif + #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT static void LogAfterScriptInitializing(); static void LogBeforeScriptProcessing(); @@ -685,9 +686,6 @@ extern int ScriptParams[32]; VALIDATE_SIZE(uStackReturnValue, 4); -#ifdef USE_DEBUG_SCRIPT_LOADER -extern int scriptToLoad; -#endif #ifdef MISSION_REPLAY extern int AllowMissionReplay; extern uint32 WaitForMissionActivate; @@ -704,11 +702,24 @@ extern bool AlreadySavedGame; #endif uint32 AddExtraDeathDelay(); -void RetryMission(int, int); -#endif +void RetryMission(int, int unk = 0); -#ifdef USE_DEBUG_SCRIPT_LOADER -extern int scriptToLoad; +enum { + 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 extern int gScriptsFile; |