summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-14 15:44:09 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-14 15:44:09 +0200
commit958e2f36bb3327ff9bbadfa3a41e289f1405ba84 (patch)
tree2bda854f90c4c915fbdcd4c2bcc855c106b15b9e /src/control
parentRevert "map memory usage high default" (diff)
downloadre3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.tar
re3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.tar.gz
re3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.tar.bz2
re3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.tar.lz
re3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.tar.xz
re3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.tar.zst
re3-958e2f36bb3327ff9bbadfa3a41e289f1405ba84.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp6
-rw-r--r--src/control/ScriptCommands.h4
-rw-r--r--src/control/ScriptDebug.cpp4
3 files changed, 14 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 49a33600..a2dd8512 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3092,7 +3092,13 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
UpdateCompareFlag(pPed->OurPedCanSeeThisOne(CWorld::Players[ScriptParams[1]].m_pPed));
return 0;
}
+#ifdef SUPPORT_GINPUT_SCRIPT
+ case COMMAND_HAS_PAD_IN_HANDS:
+ UpdateCompareFlag(CPad::GetPad(0)->IsAffectedByController);
+ return 0;
+#else
//case COMMAND_ORDER_CHAR_TO_BACKDOOR:
+#endif
//case COMMAND_ADD_CHAR_TO_GANG:
case COMMAND_IS_CHAR_OBJECTIVE_PASSED:
{
diff --git a/src/control/ScriptCommands.h b/src/control/ScriptCommands.h
index 9863e852..9cb39e23 100644
--- a/src/control/ScriptCommands.h
+++ b/src/control/ScriptCommands.h
@@ -293,7 +293,11 @@ enum {
COMMAND_IS_PLAYER_IN_ZONE,
COMMAND_IS_PLAYER_PRESSING_HORN,
COMMAND_HAS_CHAR_SPOTTED_PLAYER,
+#ifdef SUPPORT_GINPUT_SCRIPT
+ COMMAND_HAS_PAD_IN_HANDS,
+#else
COMMAND_ORDER_CHAR_TO_BACKDOOR,
+#endif
COMMAND_ADD_CHAR_TO_GANG,
COMMAND_IS_CHAR_OBJECTIVE_PASSED,
COMMAND_SET_CHAR_DRIVE_AGGRESSION,
diff --git a/src/control/ScriptDebug.cpp b/src/control/ScriptDebug.cpp
index d48804e6..1ca5f588 100644
--- a/src/control/ScriptDebug.cpp
+++ b/src/control/ScriptDebug.cpp
@@ -317,7 +317,11 @@ const tScriptCommandData commands[] = {
REGISTER_COMMAND(COMMAND_IS_PLAYER_IN_ZONE, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_STRING,), OUTPUT_ARGUMENTS(), true, -1, ""),
REGISTER_COMMAND(COMMAND_IS_PLAYER_PRESSING_HORN, INPUT_ARGUMENTS(ARGTYPE_INT,), OUTPUT_ARGUMENTS(), true, -1, ""),
REGISTER_COMMAND(COMMAND_HAS_CHAR_SPOTTED_PLAYER, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT,), OUTPUT_ARGUMENTS(), true, -1, ""),
+#ifdef SUPPORT_GINPUT_SCRIPT
+ REGISTER_COMMAND(COMMAND_HAS_PAD_IN_HANDS, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), true, -1, ""),
+#else
REGISTER_COMMAND(COMMAND_ORDER_CHAR_TO_BACKDOOR, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT,), OUTPUT_ARGUMENTS(), false, -1, ""),
+#endif
REGISTER_COMMAND(COMMAND_ADD_CHAR_TO_GANG, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT,), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_IS_CHAR_OBJECTIVE_PASSED, INPUT_ARGUMENTS(ARGTYPE_INT,), OUTPUT_ARGUMENTS(), true, -1, ""),
REGISTER_COMMAND(COMMAND_SET_CHAR_DRIVE_AGGRESSION, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT,), OUTPUT_ARGUMENTS(), false, -1, ""),