Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow water actions from within vehicle

Browse Source
This commit is contained in:
mrschick 2024-08-10 15:29:53 +02:00
parent c452f94779
commit 831bf92ca1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf
View File

@ -18,10 +18,9 @@
params ["_interactionType"];
// Ignore when self-interaction, mounted vehicle interaction, or water source actions are disabled
// Ignore during self-interaction or when water source actions are disabled
if (
_interactionType != 0
|| {vehicle ACE_player != ACE_player}
|| {XGVAR(waterSourceActions) == 0}
) exitWith {};
@ -56,8 +55,10 @@ TRACE_1("Starting interact PFH",_interactionType);
_sourcesHelped pushBack _vehicle;
// Add water source actions to the vehicle itself
private _mainAction = [_vehicle, 0, ["ACE_MainActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToObject);
private _selfAction = [_vehicle, 1, ["ACE_SelfActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToObject);
{
[_vehicle, 0, _mainAction, _x] call EFUNC(interact_menu,addActionToObject);
[_vehicle, 1, _selfAction, _x] call EFUNC(interact_menu,addActionToObject);
} forEach GVAR(subActions);
_vehicle setVariable [QGVAR(waterSourceActionsAdded), true];
TRACE_3("Added interaction to vehicle",_x,typeOf _x,_waterRemaining);

4
addons/field_rations/functions/fnc_checkWater.sqf
View File

@ -34,5 +34,7 @@ params ["_player", "_source"];
};
},
{},
LLSTRING(CheckingWater)
LLSTRING(CheckingWater),
{true},
["isNotInside"]
] call EFUNC(common,progressBar);

3
addons/field_rations/functions/fnc_drinkFromSource.sqf
View File

@ -76,5 +76,6 @@ private _progressText = if (isNull _sourceConfig) then {
_fnc_onSuccess,
_fnc_onFailure,
_progressText,
_fnc_condition
_fnc_condition,
["isNotInside"]
] call EFUNC(common,progressBar);