merge miami

2021-08-14 17:18:34 +03:00
parent ba859dc3b5 958e2f36bb
commit 39d2c427e5
4 changed files with 15 additions and 0 deletions
--- 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,