Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for minor header bug #3063

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Fix for minor header bug #3063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
600ba1d
fix for abort capture + less capture timej
Tiny-DM Nov 22, 2023
53b0611
increased time for capture
Tiny-DM Nov 23, 2023
3bb0c7f
minor addition to PR
Tiny-DM Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions A3A/addons/core/Scripts/fn_advancedTowingInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)); \
Expand Down Expand Up @@ -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;
};
};

Expand Down
4 changes: 2 additions & 2 deletions A3A/addons/core/functions/Base/fn_mrkWIN.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions A3A/addons/core/functions/REINF/fn_controlHCsquad.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions A3A/addons/core/functions/REINF/fn_controlunit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
Expand Down