Fix for minor header bug (#3063)

* fix for abort capture + less capture timej _titleStr is a private variable, so the replacement should solve the header issue. 3 seconds have been taken off the time to more closely match the actual time for the animation to finish * increased time for capture * minor addition to PR
official-antistasi-community · Nov 24, 2023 · ef1b91d · ef1b91d
1 parent cedbef1
commit ef1b91d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/A3A/addons/core/Scripts/fn_advancedTowingInit.sqf b/A3A/addons/core/Scripts/fn_advancedTowingInit.sqf
@@ -11,7 +11,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 */
 #include "..\script_component.hpp"
 FIX_LINE_NUMBERS()
-private _titleStr = localize "STR_A3A_scripts_advTowInit_title";
 
 #define SA_Find_Surface_ASL_Under_Position(_object,_positionAGL,_returnSurfaceASL,_canFloat) \
 _objectASL = AGLToASL (_object modelToWorldVisual (getCenterOfMass _object)); \
@@ -725,7 +724,7 @@ SA_Hint = {
 			[localize "STR_A3A_scripts_advTowInit_fail", [_msg]] call ExileClient_gui_notification_event_addNotification;
 		};
     } else {
-		[_titleStr, _msg] call A3A_fnc_customHint;
+		[localize "STR_A3A_scripts_advTowInit_title", _msg] call A3A_fnc_customHint;
     };
 };
 

diff --git a/A3A/addons/core/functions/Base/fn_mrkWIN.sqf b/A3A/addons/core/functions/Base/fn_mrkWIN.sqf
@@ -99,14 +99,14 @@ private _cancelActionID = player addAction [localize "STR_A3A_fn_base_mrkwin_add
     A3A_isPlayerCapturingFlag = nil;
     player switchMove "";
     player removeAction _actionID;
-    [_titleStr, localize "STR_A3A_fn_base_mrkwin_abort"] call A3A_fnc_customHint;
+    [localize "STR_A3A_fn_base_mrkwin_title", localize "STR_A3A_fn_base_mrkwin_abort"] call A3A_fnc_customHint;
 
 }, _cancellationToken];
 // returnflag Icon should be 1.5 tiems bigger than takeflag icon. 2 * 1.5 = 3
 player setUserActionText [_cancelActionID,"Aborted Outpost Capture","<img size='3' image='\A3\ui_f\data\igui\cfg\actions\returnflag_ca.paa'/>"];
 
 // Capturing
-sleep 8;
+sleep 7;
 
 if (_cancellationToken #0) exitWith {
     ServerInfo_3("Outpost at %1 (%2): Flag capture aborted by %3", _outpostGridSquare, _markerX, str player);

diff --git a/A3A/addons/core/functions/REINF/fn_controlHCsquad.sqf b/A3A/addons/core/functions/REINF/fn_controlHCsquad.sqf
@@ -37,7 +37,7 @@ _eh1 = player addEventHandler ["HandleDamage",
 	selectPlayer _unit;
 	(units group player) joinsilent group player;
 	group player selectLeader player;
-	[_titleStr, localize "STR_A3A_fn_reinf_controlHQSquad_return_damage"] call A3A_fnc_customHint;
+	[localize "STR_A3A_fn_reinf_controlHQSquad_title", localize "STR_A3A_fn_reinf_controlHQSquad_return_damage"] call A3A_fnc_customHint;
 	nil;
 	}];
 _eh2 = _unit addEventHandler ["HandleDamage",
@@ -48,7 +48,7 @@ _eh2 = _unit addEventHandler ["HandleDamage",
 	selectPlayer (_unit getVariable "owner");
 	(units group player) joinsilent group player;
 	group player selectLeader player;
-	[_titleStr, localize "STR_A3A_fn_reinf_controlHQSquad_return_damage_ai"] call A3A_fnc_customHint;
+	[localize "STR_A3A_fn_reinf_controlHQSquad_title", localize "STR_A3A_fn_reinf_controlHQSquad_return_damage_ai"] call A3A_fnc_customHint;
 	nil;
 	}];
 selectPlayer _unit;

diff --git a/A3A/addons/core/functions/REINF/fn_controlunit.sqf b/A3A/addons/core/functions/REINF/fn_controlunit.sqf
@@ -34,7 +34,7 @@ _eh1 = player addEventHandler ["HandleDamage",
 	selectPlayer _unit;
 	(units group player) joinsilent group player;
 	group player selectLeader player;
-	[_titleStr, localize "STR_A3A_fn_reinf_controlunit_return_damage"] call A3A_fnc_customHint;
+	[localize "STR_A3A_fn_reinf_controlunit_title", localize "STR_A3A_fn_reinf_controlunit_return_damage"] call A3A_fnc_customHint;
 	nil;
 	}];
 _eh2 = _unit addEventHandler ["HandleDamage",
@@ -45,7 +45,7 @@ _eh2 = _unit addEventHandler ["HandleDamage",
 	selectPlayer (_unit getVariable "owner");
 	(units group player) joinsilent group player;
 	group player selectLeader player;
-	[_titleStr, localize "STR_A3A_fn_reinf_controlunit_return_damage_ai"] call A3A_fnc_customHint;
+	[localize "STR_A3A_fn_reinf_controlunit_title", localize "STR_A3A_fn_reinf_controlunit_return_damage_ai"] call A3A_fnc_customHint;
 	nil;
 	}];
 selectPlayer _unit;