diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-30 23:47:10 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-30 23:47:10 +0100 |
| commit | bcc51f4a284f7d96d388ec093a3e12c6ab6337c1 (patch) | |
| tree | 3311da68498fc0556882464cb905fa42bd42d06d /src/control | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | added a few registered pointers and memory debug (diff) | |
| download | re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.gz re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.bz2 re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.lz re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.xz re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.zst re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 2 | ||||
| -rw-r--r-- | src/control/Script6.cpp | 2 | ||||
| -rw-r--r-- | src/control/ScriptCommands.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 085c773a..dbd477e2 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1273,7 +1273,7 @@ const tScriptCommandData commands[] = { REGISTER_COMMAND(COMMAND_IS_CHAR_LYING_DOWN, INPUT_ARGUMENTS(ARGTYPE_INT,), OUTPUT_ARGUMENTS(), true, -1, ""), REGISTER_COMMAND(COMMAND_CAN_CHAR_SEE_DEAD_CHAR, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT,), OUTPUT_ARGUMENTS(), true, -1, ""), REGISTER_COMMAND(COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER, INPUT_ARGUMENTS(ARGTYPE_FLOAT,), OUTPUT_ARGUMENTS(), false, -1, ""), -#ifndef GTA3_1_1_PATCH +#if GTA_VERSION < GTA3_PC_11 REGISTER_COMMAND(COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER, INPUT_ARGUMENTS(ARGTYPE_FLOAT,), OUTPUT_ARGUMENTS(), false, -1, ""), #endif #endif diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp index ca6a1853..acd9e424 100644 --- a/src/control/Script6.cpp +++ b/src/control/Script6.cpp @@ -1326,7 +1326,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) #endif return 0; #endif -#ifndef GTA3_1_1_PATCH +#if GTA_VERSION < GTA3_PC_11 case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER: CollectParameters(&m_nIp, 1); #ifdef FIX_BUGS diff --git a/src/control/ScriptCommands.h b/src/control/ScriptCommands.h index 56908edb..b9067bea 100644 --- a/src/control/ScriptCommands.h +++ b/src/control/ScriptCommands.h @@ -1156,7 +1156,7 @@ enum { COMMAND_IS_CHAR_LYING_DOWN, COMMAND_CAN_CHAR_SEE_DEAD_CHAR, COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER, -#ifndef GTA3_1_1_PATCH +#if GTA_VERSION < GTA3_PC_11 COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER, #endif #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT |