From 56e919dccc48e34d720a38e4ace0e662798dab2f Mon Sep 17 00:00:00 2001 From: gienkov Date: Sun, 6 Dec 2015 06:47:19 +0100 Subject: [PATCH 1/2] nozzle additonal check condition --- addons/refuel/functions/fnc_canConnectNozzle.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/refuel/functions/fnc_canConnectNozzle.sqf b/addons/refuel/functions/fnc_canConnectNozzle.sqf index 812234818e..f8503c821f 100644 --- a/addons/refuel/functions/fnc_canConnectNozzle.sqf +++ b/addons/refuel/functions/fnc_canConnectNozzle.sqf @@ -23,4 +23,4 @@ _nozzle = _unit getVariable [QGVAR(nozzle), objNull]; !(isNull _nozzle || {(_target distance _unit) > REFUEL_ACTION_DISTANCE} || - {!isNull (_target getVariable [QGVAR(nozzle), objNull])}) // TODO verify cant connect multiple fuel lines + {!isNull (_target getVariable [QGVAR(nozzle), objNull])} || isEngineOn _target) // TODO verify cant connect multiple fuel lines From 8048b2ecbd6355d9bcb40fe4537b7180bd185e58 Mon Sep 17 00:00:00 2001 From: gienkov Date: Tue, 9 Feb 2016 09:35:16 +0100 Subject: [PATCH 2/2] lazy evaluation fix --- addons/refuel/functions/fnc_canConnectNozzle.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/refuel/functions/fnc_canConnectNozzle.sqf b/addons/refuel/functions/fnc_canConnectNozzle.sqf index f8503c821f..d2111fdb66 100644 --- a/addons/refuel/functions/fnc_canConnectNozzle.sqf +++ b/addons/refuel/functions/fnc_canConnectNozzle.sqf @@ -22,5 +22,6 @@ params ["_unit", "_target"]; _nozzle = _unit getVariable [QGVAR(nozzle), objNull]; !(isNull _nozzle || + {isEngineOn _target} || {(_target distance _unit) > REFUEL_ACTION_DISTANCE} || - {!isNull (_target getVariable [QGVAR(nozzle), objNull])} || isEngineOn _target) // TODO verify cant connect multiple fuel lines + {!isNull (_target getVariable [QGVAR(nozzle), objNull])}) // TODO verify cant connect multiple fuel lines