Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

more 1.1 patch

Browse Source
This commit is contained in:
Nikolay Korolev 2020-04-24 01:01:41 +03:00
parent 05ddc80ea2
commit 0b12cacf15
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librw

@ -1 +1 @@
Subproject commit 752fceb1e3c4ce06b6f20b9c4471927821469bf2 Subproject commit 374f951d7cee353914059d8ddf9c5aff7d764984

10
src/control/Script.cpp
View File

@ -9649,6 +9649,16 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0]; CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0];
#endif #endif
return 0; 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 #endif
default: default:
assert(0); assert(0);

3
src/control/ScriptCommands.h
View File

@ -1156,5 +1156,8 @@ enum {
COMMAND_IS_CHAR_LYING_DOWN, COMMAND_IS_CHAR_LYING_DOWN,
COMMAND_CAN_CHAR_SEE_DEAD_CHAR, COMMAND_CAN_CHAR_SEE_DEAD_CHAR,
COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER, COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER,
#ifndef GTA3_1_1_PATCH
COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER
#endif
#endif #endif
}; };

9
src/skel/win/win.cpp
View File

@ -594,8 +594,9 @@ psInitialise(void)
C_PcSave::SetSaveDirectory(_psGetUserFilesFolder()); C_PcSave::SetSaveDirectory(_psGetUserFilesFolder());
InitialiseLanguage(); InitialiseLanguage();
#ifndef GTA3_1_1_PATCH
FrontEndMenuManager.LoadSettings(); FrontEndMenuManager.LoadSettings();
#endif
gGameState = GS_START_UP; gGameState = GS_START_UP;
TRACE("gGameState = GS_START_UP"); TRACE("gGameState = GS_START_UP");
@ -640,7 +641,11 @@ psInitialise(void)
_dwOperatingSystemVersion = OS_WIN95; _dwOperatingSystemVersion = OS_WIN95;
} }
} }
#ifdef GTA3_1_1_PATCH
FrontEndMenuManager.LoadSettings();
#endif
dwDXVersion = GetDXVersion(); dwDXVersion = GetDXVersion();
debug("DirectX version 0x%x\n", dwDXVersion); debug("DirectX version 0x%x\n", dwDXVersion);