diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 17:14:21 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 17:14:21 +0300 |
| commit | 478bdcc1ca041bccf791c3aa7dbbc1a04da72454 (patch) | |
| tree | 589cfc6708f54f58e10d5c8774fcb244c79b46e3 /src/control/Script.h | |
| parent | 668311a444a350dea9f23e5828722a5f40e7a3d5 (diff) | |
| parent | 63046894b099598c41096651a9816ee3adc032a4 (diff) | |
merge
Diffstat (limited to 'src/control/Script.h')
| -rw-r--r-- | src/control/Script.h | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/control/Script.h b/src/control/Script.h index 4e443727..ccd9d7b5 100644 --- a/src/control/Script.h +++ b/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 -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 |