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 branch 'release'

Browse Source 
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
This commit is contained in:
Glowbal 2016-02-04 20:34:32 +01:00
commit f1ce133d32
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,10 @@ private _maxFuel = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >>
params ["_args", "_pfID"]; params ["_args", "_pfID"];
_args params [["_source", objNull, [objNull]], ["_sink", objNull, [objNull]], ["_unit", objNull, [objNull]], ["_nozzle", objNull, [objNull]], ["_rate", 1, [0]], ["_startFuel", 0, [0]], ["_maxFuel", 0, [0]], ["_connectFromPoint", [0,0,0], [[]], 3], ["_connectToPoint", [0,0,0], [[]], 3]]; _args params [["_source", objNull, [objNull]], ["_sink", objNull, [objNull]], ["_unit", objNull, [objNull]], ["_nozzle", objNull, [objNull]], ["_rate", 1, [0]], ["_startFuel", 0, [0]], ["_maxFuel", 0, [0]], ["_connectFromPoint", [0,0,0], [[]], 3], ["_connectToPoint", [0,0,0], [[]], 3]];
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];

19
addons/zeus/CfgVehicles.hpp
View File

@ -167,4 +167,23 @@ class CfgVehicles {
sync[] = {}; sync[] = {};
}; };
}; };
class GVAR(moduleSetSuppression): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleSetSupp_DisplayName);
function = QFUNC(moduleSetSuppression);
class ModuleDescription {
description = "Set group of units to supressed.";
sync[] = {};
};
};
class GVAR(moduleDisableSuppression): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleDisableSupp_DisplayName);
function = QFUNC(moduleDisableSuppression);
class ModuleDescription {
description = "Remove suppression for units in group";
sync[] = {};
};
};
}; };

2
addons/zeus/XEH_preInit.sqf
View File

@ -17,6 +17,8 @@ PREP(moduleSetMedicalFacility);
PREP(moduleSurrender); PREP(moduleSurrender);
PREP(moduleUnconscious); PREP(moduleUnconscious);
PREP(moduleZeusSettings); PREP(moduleZeusSettings);
PREP(moduleDisableSuppression);
PREP(moduleSetSuppression);
if (isServer) then { if (isServer) then {
["zeusUnitAssigned", FUNC(handleZeusUnitAssigned)] call EFUNC(common,addEventHandler); ["zeusUnitAssigned", FUNC(handleZeusUnitAssigned)] call EFUNC(common,addEventHandler);