diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-14 17:18:34 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-14 17:18:34 +0300 |
| commit | 39d2c427e55a43bc836034a742bbcb89aef01fdc (patch) | |
| tree | 1d620862aef42c8ded71c2ade454567e5616c890 /src/control | |
| parent | ba859dc3b5510083ab95566a8c5a30934b402b53 (diff) | |
| parent | 958e2f36bb3327ff9bbadfa3a41e289f1405ba84 (diff) | |
merge miami
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 6 | ||||
| -rw-r--r-- | src/control/ScriptCommands.h | 4 | ||||
| -rw-r--r-- | src/control/ScriptDebug.cpp | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 0fa4de6b..1e76e509 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -3272,7 +3272,13 @@ int8 CRunningScript::ProcessCommands200To299(int32 command) UpdateCompareFlag(pPed->OurPedCanSeeThisOne(CWorld::Players[GET_INTEGER_PARAM(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 93f670a9..ea968697 100644 --- a/src/control/ScriptCommands.h +++ b/src/control/ScriptCommands.h @@ -298,7 +298,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 cdf9f7cd..fd64b44e 100644 --- a/src/control/ScriptDebug.cpp +++ b/src/control/ScriptDebug.cpp @@ -322,7 +322,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, ""), |