summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-30 18:27:46 +0100
committerGitHub <noreply@github.com>2020-11-30 18:27:46 +0100
commit356a32eb0954f8f924a4817c7b67d79f80611718 (patch)
treef3d376094b50e4cdbfe4b65afef37aab1ccde9a6 /src/control
parentadd debug script hotkey (diff)
parentGTA_VERSION define and some config.h cleanup (diff)
downloadre3-356a32eb0954f8f924a4817c7b67d79f80611718.tar
re3-356a32eb0954f8f924a4817c7b67d79f80611718.tar.gz
re3-356a32eb0954f8f924a4817c7b67d79f80611718.tar.bz2
re3-356a32eb0954f8f924a4817c7b67d79f80611718.tar.lz
re3-356a32eb0954f8f924a4817c7b67d79f80611718.tar.xz
re3-356a32eb0954f8f924a4817c7b67d79f80611718.tar.zst
re3-356a32eb0954f8f924a4817c7b67d79f80611718.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp2
-rw-r--r--src/control/Script6.cpp2
-rw-r--r--src/control/ScriptCommands.h2
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