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

Fix zeus cargo display for empty vehicles

Browse Source 
The cargo wasn't displaying for empty vehicles because they use a different display.
This commit is contained in:
SilentSpike 2016-05-17 12:10:52 +01:00
parent d90d5a7ac1
commit 4cbded1811
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/zeus/CfgVehicles.hpp
View File

@ -118,11 +118,7 @@ class CfgVehicles {
}; };
class GVAR(moduleGlobalSetSkill): GVAR(moduleBase) { class GVAR(moduleGlobalSetSkill): GVAR(moduleBase) {
displayName = "Global AI Skill"; displayName = "Global AI Skill";
// icon = "\a3\Modules_F_Curator\Data\iconEndMission_ca.paa";
// portrait = "\a3\Modules_F_Curator\Data\portraitEndMission_ca.paa";
curatorInfoType = QGVAR(RscGlobalSetSkill); curatorInfoType = QGVAR(RscGlobalSetSkill);
class Arguments {};
class Attributes {};//todo, make it a threden as well
}; };
class GVAR(moduleSetMedic): GVAR(moduleBase) { class GVAR(moduleSetMedic): GVAR(moduleBase) {
curatorCanAttach = 1; curatorCanAttach = 1;

4
addons/zeus/functions/fnc_ui_vehCargo.sqf
View File

@ -3,12 +3,14 @@
params ["_control"]; params ["_control"];
TRACE_1("params",_control); TRACE_1("params",_control);
private _veh = missionNamespace getVariable ["BIS_fnc_initCuratorAttributes_target", objnull]; private _veh = GETMVAR(BIS_fnc_initCuratorAttributes_target,objnull);
TRACE_1("",_veh); TRACE_1("",_veh);
private _loaded = _veh getVariable [QEGVAR(cargo,loaded), []]; private _loaded = _veh getVariable [QEGVAR(cargo,loaded), []];
TRACE_1("",_loaded); TRACE_1("",_loaded);
lbClear ((ctrlParent _control) displayCtrl 80086);
{ {
((ctrlParent _control) displayCtrl 80086) lbAdd (str _x); ((ctrlParent _control) displayCtrl 80086) lbAdd (str _x);
} forEach _loaded; } forEach _loaded;

14
addons/zeus/ui/RscAttributes.hpp
View File

@ -193,7 +193,7 @@ class GVAR(cargoAttribute): RscControlsGroupNoScrollbars {
x = W_PART(10); x = W_PART(10);
y = 0; y = 0;
w = W_PART(16); w = W_PART(16);
h = H_PART(2.5); h = H_PART(3);
colorBackground[] = {1,1,1,0.1}; colorBackground[] = {1,1,1,0.1};
}; };
class Cargo: RscListBox { class Cargo: RscListBox {
@ -211,7 +211,17 @@ class RscDisplayAttributesVehicle: RscDisplayAttributes {
class Controls: Controls { class Controls: Controls {
class Content: Content { class Content: Content {
class Controls: controls { class Controls: controls {
class Cargo: GVAR(cargoAttribute) { }; class ace_cargo: GVAR(cargoAttribute) { };
};
};
};
};
class RscDisplayAttributesVehicleEmpty: RscDisplayAttributes {
class Controls: Controls {
class Content: Content {
class Controls: controls {
class ace_cargo: GVAR(cargoAttribute) { };
}; };
}; };
}; };