diff options
Diffstat (limited to 'src/control/Script.h')
| -rw-r--r-- | src/control/Script.h | 45 |
1 files changed, 40 insertions, 5 deletions
diff --git a/src/control/Script.h b/src/control/Script.h index 5682024b..d14abe9d 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -347,9 +347,13 @@ public: void LocateCharCommand(int32, uint32*); void LocateCharCharCommand(int32, uint32*); void LocateCharCarCommand(int32, uint32*); +#if GTA_VERSION > GTA3_PS2_160 void LocateCharObjectCommand(int32, uint32*); +#endif void LocateCarCommand(int32, uint32*); +#if GTA_VERSION > GTA3_PS2_160 void LocateSniperBulletCommand(int32, uint32*); +#endif void PlayerInAreaCheckCommand(int32, uint32*); void PlayerInAngledAreaCheckCommand(int32, uint32*); void CharInAreaCheckCommand(int32, uint32*); @@ -370,6 +374,13 @@ public: #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT int CollectParameterForDebug(char* buf, bool& var); void GetStoredParameterForDebug(char* buf); + void LogOnStartProcessing(); + void LogBeforeProcessingCommand(int32 command); + void LogAfterProcessingCommand(int32 command); + + static char commandInfo[]; + static uint32 storedIp; + #endif float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; } @@ -576,6 +587,17 @@ public: public: static void SwitchToMission(int32 mission); #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(); + static void LogAfterScriptProcessing(); +#endif }; #ifdef MISSION_REPLAY @@ -587,9 +609,22 @@ extern int missionRetryScriptIndex; extern bool doingMissionRetry; uint32 AddExtraDeathDelay(); -void RetryMission(int, int); -#endif +void RetryMission(int, int unk = 0); -#ifdef USE_DEBUG_SCRIPT_LOADER -extern int scriptToLoad; -#endif
\ No newline at end of file +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 |