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

Fix logistics JIP bugs #3026

Merged
merged 1 commit into from
Nov 4, 2023
Merged

Fix logistics JIP bugs #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion A3A/addons/core/functions/Base/fn_flagaction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ switch _typeX do

_actionX = _flag addAction [format ["<t>Carry %1</t> <img image='\A3\ui_f\data\igui\cfg\actions\take_ca.paa' size='1.6' shadow=2 />",name _flag], A3A_fnc_carry,nil,5,true,false,"","(isPlayer _this) and (_this == _this getVariable ['owner',objNull]) and (isNull attachedTo _target) and !(_this getVariable [""helping"",false]);",4];// TODO: partial string created - unsure about implementation
_flag setUserActionText [_actionX,format [localize "STR_A3A_fn_base_flagaction_heal_carry",name _flag],"<t size='2'><img image='\A3\ui_f\data\igui\cfg\actions\take_ca.paa'/></t>"];// TODO: string created, unsure about implementation
[_flag] call A3A_Logistics_fnc_addLoadAction;

// Call the internal logistics function, because this one is already global-JIP
[_flag, "load"] call A3A_Logistics_fnc_addAction;
};
};
case "remove":
Expand Down
3 changes: 2 additions & 1 deletion A3A/addons/logistics/Public/fn_addLoadAction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ if (!alive _object) exitWith {

if (([_object] call A3A_Logistics_fnc_getCargoNodeType) isEqualTo -1) exitWith {nil};

[_object , _action] remoteExec ["A3A_Logistics_fnc_addAction", 0, _object];
private _jipKey = "A3A_Logistics_" + _action + ((str _object splitString ":") joinString "");
Bob-Murphy marked this conversation as resolved.
Show resolved Hide resolved
[_object, _action, _jipKey] remoteExec ["A3A_Logistics_fnc_addAction", 0, _jipKey];
nil