diff --git a/addons/cargo/CfgEventHandlers.hpp b/addons/cargo/CfgEventHandlers.hpp index f5dd29da0e..f80fefa3aa 100644 --- a/addons/cargo/CfgEventHandlers.hpp +++ b/addons/cargo/CfgEventHandlers.hpp @@ -1,4 +1,3 @@ - class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_FILE(XEH_preInit)); diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp index ecca6ee341..d5572741da 100644 --- a/addons/cargo/CfgVehicles.hpp +++ b/addons/cargo/CfgVehicles.hpp @@ -1,13 +1,11 @@ - class CfgVehicles { - class ACE_Module; class ACE_moduleCargoSettings: ACE_Module { scope = 2; displayName = CSTRING(SettingsModule_DisplayName); icon = QUOTE(PATHTOF(UI\Icon_Module_Cargo_ca.paa)); category = "ACE"; - function = QUOTE(DFUNC(moduleSettings)); + function = QFUNC(moduleSettings); functionPriority = 1; isGlobal = 1; isTriggerActivated = 0; @@ -41,11 +39,11 @@ class CfgVehicles { };*/ }; }; - class Tank: LandVehicle { GVAR(space) = 4; GVAR(hasCargo) = 1; }; + class Car_F; class Truck_F: Car_F { GVAR(space) = 8; @@ -53,25 +51,20 @@ class CfgVehicles { }; class Air; - // Repair helicopters class Helicopter: Air { GVAR(space) = 8; GVAR(hasCargo) = 1; }; - class Heli_Transport_02_base_F; class I_Heli_Transport_02_F : Heli_Transport_02_base_F { GVAR(space) = 20; GVAR(hasCargo) = 1; }; - - // Repair fixed wing aircraft class Plane: Air { GVAR(space) = 4; GVAR(hasCargo) = 1; }; - // boats class Ship; class Ship_F: Ship { GVAR(space) = 4; diff --git a/addons/cargo/XEH_preInit.sqf b/addons/cargo/XEH_preInit.sqf index f0cf3357cd..9cc90501c1 100644 --- a/addons/cargo/XEH_preInit.sqf +++ b/addons/cargo/XEH_preInit.sqf @@ -2,22 +2,23 @@ ADDON = false; +PREP(canLoad); PREP(canLoadItemIn); PREP(canUnloadItem); -PREP(canLoad); PREP(findNearestVehicle); PREP(getCargoSpaceLeft); -PREP(GetSizeItem); +PREP(getSizeItem); +PREP(handleDestroyed); PREP(initObject); PREP(initVehicle); -PREP(handleDestroyed); -PREP(moduleSettings); PREP(loadItem); +PREP(moduleSettings); PREP(onMenuOpen); -PREP(unloadItem); -PREP(validateCargoSpace); PREP(startLoadIn); PREP(startUnload); +PREP(unloadItem); +PREP(validateCargoSpace); + GVAR(initializedItemClasses) = []; if (isServer) then { diff --git a/addons/cargo/config.cpp b/addons/cargo/config.cpp index 2972e8ef1b..1aefa49616 100644 --- a/addons/cargo/config.cpp +++ b/addons/cargo/config.cpp @@ -12,7 +12,7 @@ class CfgPatches { }; }; +#include "ACE_Settings.hpp" #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" #include "menu.hpp" -#include "ACE_Settings.hpp" diff --git a/addons/cargo/menu.hpp b/addons/cargo/menu.hpp index 35976d19ad..6e2bf45a47 100644 --- a/addons/cargo/menu.hpp +++ b/addons/cargo/menu.hpp @@ -1,4 +1,3 @@ - #include "\z\ace\addons\common\define.hpp" class GVAR(menu) { @@ -101,4 +100,4 @@ class GVAR(menu) { action = QUOTE([] call FUNC(startUnload);); }; }; -}; \ No newline at end of file +};