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 #1275 from acemod/fixUAVandInteractionInhert

Browse Source 
Fix UAV and Interaction Compile Inheritance
This commit is contained in:
Nicolás Badano 2015-05-27 12:20:46 -03:00
commit c365008330
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/interact_menu/functions/fnc_compileMenu.sqf
View File

@ -28,12 +28,12 @@ if !(isNil {missionNamespace getVariable [_actionsVarName, nil]}) exitWith {};
private "_recurseFnc";
_recurseFnc = {
private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_position", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction", "_i"];
private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_position", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction"];
EXPLODE_1_PVT(_this,_actionsCfg);
_actions = [];
for "_i" from 0 to (count _actionsCfg) - 1 do {
_entryCfg = _actionsCfg select _i;
{
_entryCfg = _x;
if(isClass _entryCfg) then {
_displayName = getText (_entryCfg >> "displayName");
_distance = getNumber (_entryCfg >> "distance");
@ -92,7 +92,7 @@ _recurseFnc = {
];
_actions pushBack _entry;
};
};
} forEach (configProperties [_actionsCfg, "isClass _x", true]);
_actions
};

6
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
View File

@ -33,8 +33,8 @@ _recurseFnc = {
EXPLODE_1_PVT(_this,_actionsCfg);
_actions = [];
for "_i" from 0 to (count _actionsCfg) - 1 do {
_entryCfg = _actionsCfg select _i;
{
_entryCfg = _x;
if(isClass _entryCfg) then {
_displayName = getText (_entryCfg >> "displayName");
@ -76,7 +76,7 @@ _recurseFnc = {
];
_actions pushBack _entry;
};
};
} forEach (configProperties [_actionsCfg, "isClass _x", true]);
_actions
};

20
addons/logistics_uavbattery/CfgVehicles.hpp
View File

@ -1,15 +1,25 @@
class CfgVehicles {
class Helicopter_Base_F;
class UAV_01_base_F: Helicopter_Base_F {
class Air;
class Helicopter: Air {
class ACE_Actions {
class ACE_MainActions {
class ACE_MainActions {};
};
};
class Helicopter_Base_F: Helicopter {
class ACE_Actions: ACE_Actions{
class ACE_MainActions: ACE_MainActions {};
};
};
class UAV_01_base_F: Helicopter_Base_F {
class ACE_Actions: ACE_Actions{
class ACE_MainActions: ACE_MainActions {
class GVAR(RefuelUAV) {
displayName = "$STR_ACE_logistics_uavbattery_Recharge";
distance = 4;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRefuelUAV));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(refuelUAV));
showDisabled = 0; \
priority = 1.245; \
showDisabled = 0;
priority = 1.245;
icon = QUOTE(PATHTOF(ui\UAV_battery_ca.paa));
};
};