action_inuse

tbox1911 · Feb 4, 2025 · 49829ff · 49829ff
1 parent 85d4a37
commit 49829ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core.liberation/scripts/client/misc/is_menuok.sqf b/core.liberation/scripts/client/misc/is_menuok.sqf
@@ -4,6 +4,7 @@ private _no_uav = ((UAVControl (getConnectedUAV player)) select 1 == "");
 private _R3F_move = isNull R3F_LOG_joueur_deplace_objet;
 private _no_flight = (round (getPos player select 2) <= 0);
 private _no_tunnel = !(player getVariable ["SOG_player_in_tunnel", false]);
+private _no_action = !(player getVariable ["GRLIB_action_inuse", false]);
 private _no_selection = (count (groupSelectedUnits player) == 0);
 
-(_alive && _on_foot && _R3F_move && _no_flight && _no_tunnel && _no_uav && _no_selection && build_confirmed == 0);
+(_alive && _on_foot && _R3F_move && _no_flight && _no_tunnel && _no_action && _no_uav && _no_selection && build_confirmed == 0);
diff --git a/core.liberation/scripts/client/spawn/do_halo.sqf b/core.liberation/scripts/client/spawn/do_halo.sqf
@@ -66,6 +66,7 @@ diag_log format ["Airdrop %1 on %2 at %3", (typeOf _unit), halo_position, time];
 
 if ( dojump > 0 ) then {
 	halo_position = halo_position getPos [floor(random 100), floor(random 360)];
+	player setVariable ["GRLIB_action_inuse", true, true];
 	if (_is_vehicle) then {
 		// Vehicle HALO
 		if ([_cost] call F_pay) then {
@@ -96,7 +97,6 @@ if ( dojump > 0 ) then {
 		if (!isNil "_my_squad") then { { _units pushBack _x } forEach units _my_squad };
 
 		// Jump!
-		player setVariable ["GRLIB_action_inuse", true, true];
 		private _unit_list_halo = _units select {
 			!(isPlayer _x) && (isNull objectParent _x) &&
 			(_x distance2D player < 30) &&
@@ -111,6 +111,7 @@ if ( dojump > 0 ) then {
 			[_x, halo_position] spawn paraDrop;
 			sleep 1;
 		} forEach _unit_list_halo;
-		player setVariable ["GRLIB_action_inuse", false, true];
 	};
+	sleep 1;
+	player setVariable ["GRLIB_action_inuse", false, true];
 };