build & logic fixes

TheWreckingCrewUK · Aug 6, 2019 · 9c47282 · 9c47282
1 parent 0432b8d
commit 9c47282
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/@twc_framework/addons/twc_ai_control_gestures/CfgVehicles.hpp b/@twc_framework/addons/twc_ai_control_gestures/CfgVehicles.hpp
@@ -21,7 +21,7 @@ class CfgVehicles {
 
 				class TWC_AI_Control_Gesture_Halt {
 					displayName = "Halt";
-					condition = "true":
+					condition = "true";
 					statement = "[_target] call TWC_AI_Control_Gestures_fnc_signalHalt";
 					icon = "";
 					showDisabled = 1;

diff --git a/@twc_framework/addons/twc_ai_control_gestures/functions/fn_clientPreInit.sqf b/@twc_framework/addons/twc_ai_control_gestures/functions/fn_clientPreInit.sqf
@@ -2,7 +2,7 @@
 
 [
 	"TWC",
-	"TWC_AI_Control_Gestures",
+	"TWC_AI_Control_Gestures_Advance",
 	"Advance Signal",
 	{
 		[player] call TWC_AI_Control_Gestures_fnc_signalAdvance;
@@ -20,14 +20,14 @@
 
 [
 	"TWC",
-	"TWC_AI_Control_Gestures",
+	"TWC_AI_Control_Gestures_Halt",
 	"Halt Signal",
 	{
 		[player] call TWC_AI_Control_Gestures_fnc_signalHalt;
 	},
 	"",
 	[
-		DIK_NUMPAD1,
+		DIK_NUMPAD2,
 		[
 			false,
 			false,
@@ -39,7 +39,7 @@
 [
 	"TWC_Show_Gestures",
 	"CHECKBOX",
-	["Show Gestures Menu", "Show the Custom TWC AI Control Gestures Menu under Self-Interaction"],
+	"Show Gestures Menu",
 	"TWC",
 	true,
 	false

diff --git a/@twc_framework/addons/twc_ai_control_gestures/functions/fn_init.sqf b/@twc_framework/addons/twc_ai_control_gestures/functions/fn_init.sqf
@@ -23,12 +23,16 @@ _fnc_checkNearbyPlayers = {
 ["TWC_AI_Control_Gestures_doHalt", {
 	params ["_group"];
 
-	_group setVariable ["TWC_AI_Control_Gestures_Halted", true, true];
-	_waypoint = _group addWaypoint [position (leader _group), 0];
-	_waypoint setWaypointType "HOLD";
-	[_group, 0] setWaypointBehaviour "CARELESS";
+	_hasPlayerHaltedThem = _group getVariable ["TWC_AI_Control_Gestures_Halted", false];
 
-	_group call _fnc_checkNearbyPlayers;
+	if !(_hasPlayerHaltedThem) then {
+		_group setVariable ["TWC_AI_Control_Gestures_Halted", true, true];
+		_waypoint = _group addWaypoint [position (leader _group), 0];
+		_waypoint setWaypointType "HOLD";
+		[_group, 0] setWaypointBehaviour "CARELESS";
+
+		_group call _fnc_checkNearbyPlayers;
+	};
 }] call CBA_fnc_addEventHandler;
 
 ["TWC_AI_Control_Gestures_doAdvance", {

diff --git a/prep_all_mods.cmd b/prep_all_mods.cmd
@@ -14,7 +14,7 @@ for /d %%i in (*) do (
 		cd !tmp!
 		for /d %%a in (*) do (
 			echo Pboing %%a
-			makePbo !tmp!\%%a
+			makePbo -ABU -X "thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew,source" -Z=default -@=%%a !tmp!\%%a
 		)
 	)
 )

diff --git a/prep_config_compatibility.cmd b/prep_config_compatibility.cmd
@@ -13,7 +13,7 @@ for /d %%i in (*) do (
 		cd !tmp!
 		for /d %%a in (*) do (
 			echo Pboing %%a
-			makePbo !tmp!\%%a
+			makePbo -ABU -X "thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew,source" -Z=default -@=%%a !tmp!\%%a
 		)
 	)
 )

diff --git a/prep_framework.cmd b/prep_framework.cmd
@@ -13,7 +13,7 @@ for /d %%i in (*) do (
 		cd !tmp!
 		for /d %%a in (*) do (
 			echo Pboing %%a
-			makePbo !tmp!\%%a
+			makePbo -ABU -X "thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew,source" -Z=default -@=%%a !tmp!\%%a
 		)
 	)
 )

diff --git a/prep_public.cmd b/prep_public.cmd
@@ -13,7 +13,7 @@ for /d %%i in (*) do (
 		cd !tmp!
 		for /d %%a in (*) do (
 			echo Pboing %%a
-			makePbo !tmp!\%%a
+			makePbo -ABU -X "thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew,source" -Z=default -@=%%a !tmp!\%%a
 		)
 	)
 )