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

Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect

Browse Source 
Fix refuel PFH not exiting on nozzle disconnect
This commit is contained in:
Thomas Kooi 2016-02-04 19:47:52 +01:00
commit 3e5908faf8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/refuel/functions/fnc_connectNozzle.sqf
View File

@ -35,8 +35,8 @@ _unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(Cancel)], {GVAR(placeAction) = PLACE_CANCEL;}]; _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(Cancel)], {GVAR(placeAction) = PLACE_CANCEL;}];
[{ [{
private["_virtualPos", "_virtualPosASL", "_lineInterection"]; private ["_virtualPos", "_virtualPosASL", "_lineInterection"];
params ["_args","_pfID"]; params ["_args", "_pfID"];
_args params ["_unit", "_target", "_nozzle", "_actionID"]; _args params ["_unit", "_target", "_nozzle", "_actionID"];
_virtualPosASL = (eyePos _unit) vectorAdd (positionCameraToWorld [0,0,0.6]) vectorDiff (positionCameraToWorld [0,0,0]); _virtualPosASL = (eyePos _unit) vectorAdd (positionCameraToWorld [0,0,0.6]) vectorDiff (positionCameraToWorld [0,0,0]);

4
addons/refuel/functions/fnc_refuel.sqf
View File

@ -29,6 +29,10 @@ _maxFuel = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >> QGVAR(f
params ["_args", "_pfID"]; params ["_args", "_pfID"];
_args params ["_source", "_sink", "_unit", "_nozzle", "_rate", "_startFuel", "_maxFuel", "_connectFromPoint", "_connectToPoint"]; _args params ["_source", "_sink", "_unit", "_nozzle", "_rate", "_startFuel", "_maxFuel", "_connectFromPoint", "_connectToPoint"];
if !(_nozzle getVariable [QGVAR(isConnected), false]) exitWith {
[_pfID] call CBA_fnc_removePerFrameHandler;
};
if (!alive _source || {!alive _sink}) exitWith { if (!alive _source || {!alive _sink}) exitWith {
[objNull, _nozzle] call FUNC(dropNozzle); [objNull, _nozzle] call FUNC(dropNozzle);
_nozzle setVariable [QGVAR(isConnected), false, true]; _nozzle setVariable [QGVAR(isConnected), false, true];