diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-24 00:01:41 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-24 00:01:41 +0200 |
| commit | 0b12cacf15baea97414d401eb2684cfc4cec8d0d (patch) | |
| tree | 0d59b3a90372bb06635edb341861141ebcc92b11 /src | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.gz re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.bz2 re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.lz re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.xz re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.zst re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/Script.cpp | 10 | ||||
| -rw-r--r-- | src/control/ScriptCommands.h | 3 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 9 |
3 files changed, 20 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index c7c762d2..0445922a 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -9650,6 +9650,16 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) #endif return 0; #endif +#ifndef GTA3_1_1_PATCH + case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER: + CollectParameters(&m_nIp, 1); +#ifdef FIX_BUGS + CPed::nThreatReactionRangeMultiplier = *(float*)&ScriptParams[0]; +#else + CPed::nThreatReactionRangeMultiplier = (float)ScriptParams[0]; +#endif + return 0; +#endif default: assert(0); } diff --git a/src/control/ScriptCommands.h b/src/control/ScriptCommands.h index dafe2418..77cf3f0f 100644 --- a/src/control/ScriptCommands.h +++ b/src/control/ScriptCommands.h @@ -1156,5 +1156,8 @@ enum { COMMAND_IS_CHAR_LYING_DOWN, COMMAND_CAN_CHAR_SEE_DEAD_CHAR, COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER, +#ifndef GTA3_1_1_PATCH + COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER +#endif #endif };
\ No newline at end of file diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index d13d3c52..8697c19c 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -594,8 +594,9 @@ psInitialise(void) C_PcSave::SetSaveDirectory(_psGetUserFilesFolder()); InitialiseLanguage(); - +#ifndef GTA3_1_1_PATCH FrontEndMenuManager.LoadSettings(); +#endif gGameState = GS_START_UP; TRACE("gGameState = GS_START_UP"); @@ -640,7 +641,11 @@ psInitialise(void) _dwOperatingSystemVersion = OS_WIN95; } } - + +#ifdef GTA3_1_1_PATCH + FrontEndMenuManager.LoadSettings(); +#endif + dwDXVersion = GetDXVersion(); debug("DirectX version 0x%x\n", dwDXVersion); |