From 9d29aa210725482ec1d136f4690b7294d1e275be Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 30 May 2015 01:37:41 -0300 Subject: [PATCH] - Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing. - Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it --- addons/common/CfgVehicles.hpp | 13 +++++-------- addons/common/config.cpp | 2 +- addons/explosives/CfgModule.hpp | 7 ++----- addons/hearing/CfgVehicles.hpp | 4 ++-- addons/interaction/CfgVehicles.hpp | 4 ++-- addons/map/CfgVehicles.hpp | 6 ++++-- addons/microdagr/CfgVehicles.hpp | 10 +++------- addons/mk6mortar/CfgVehicles.hpp | 9 +++------ addons/nametags/CfgVehicles.hpp | 9 +++------ addons/respawn/CfgVehicles.hpp | 17 +++++++---------- addons/switchunits/CfgVehicles.hpp | 4 ++-- addons/vehiclelock/CfgVehicles.hpp | 13 +++++-------- 12 files changed, 39 insertions(+), 59 deletions(-) diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp index 1adf622494..01e9bc7431 100644 --- a/addons/common/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -25,11 +25,8 @@ class CfgVehicles { // += needs a non inherited entry in that class, otherwise it simply overwrites //#include - class Logic; - class Module_F: Logic { - class ModuleDescription {}; - }; - class ACE_ModuleCheckPBOs: Module_F { + class ACE_Module; + class ACE_ModuleCheckPBOs: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Common_CheckPBO_DisplayName"; @@ -72,12 +69,12 @@ class CfgVehicles { }; }; }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_Common_CheckPBO_Description"; }; }; - class ACE_ModuleLSDVehicles: Module_F { + class ACE_ModuleLSDVehicles: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Common_LSDVehicles_DisplayName"; @@ -87,7 +84,7 @@ class CfgVehicles { isGlobal = 1; class Arguments { }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_Common_LSDVehicles_Description"; sync[] = {"AnyVehicle"}; }; diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 3f1e5a6308..dd13d10ec0 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_main"}; + requiredAddons[] = {"ace_main","ace_modules"}; author[] = {"KoffeinFlummi"}; authorUrl = "https://github.com/KoffeinFlummi/"; VERSION_CONFIG; diff --git a/addons/explosives/CfgModule.hpp b/addons/explosives/CfgModule.hpp index 52f70ea3af..a091d927ac 100644 --- a/addons/explosives/CfgModule.hpp +++ b/addons/explosives/CfgModule.hpp @@ -1,8 +1,5 @@ -class Logic; -class Module_F: Logic { - class ModuleDescription {}; -}; -class ACE_ModuleExplosive: Module_F { +class ACE_Module; +class ACE_ModuleExplosive: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Explosive_Module_DisplayName"; diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp index 16bb47014a..eaa765d814 100644 --- a/addons/hearing/CfgVehicles.hpp +++ b/addons/hearing/CfgVehicles.hpp @@ -94,8 +94,8 @@ class CfgVehicles { }; - class Module_F; - class ACE_ModuleHearing: Module_F { + class ACE_Module; + class ACE_ModuleHearing: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Hearing_Module_DisplayName"; diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 804aba1100..0f07accdee 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -1,7 +1,7 @@ class CfgVehicles { - class Module_F; - class ACE_ModuleInteraction: Module_F { + class ACE_Module; + class ACE_ModuleInteraction: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_InteractionSystem_Module_DisplayName"; diff --git a/addons/map/CfgVehicles.hpp b/addons/map/CfgVehicles.hpp index a5194e015e..43db54628b 100644 --- a/addons/map/CfgVehicles.hpp +++ b/addons/map/CfgVehicles.hpp @@ -1,6 +1,7 @@ class CfgVehicles { - class Module_F; - class ACE_ModuleMap: Module_F { + + class ACE_Module; + class ACE_ModuleMap: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Map_Module_DisplayName"; @@ -39,6 +40,7 @@ class CfgVehicles { }; }; + class Module_F; class ACE_ModuleBlueForceTracking: Module_F { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; diff --git a/addons/microdagr/CfgVehicles.hpp b/addons/microdagr/CfgVehicles.hpp index 949860742d..bd3164ac72 100644 --- a/addons/microdagr/CfgVehicles.hpp +++ b/addons/microdagr/CfgVehicles.hpp @@ -36,12 +36,8 @@ class CfgVehicles { }; }; - class Logic; - class Module_F: Logic { - class ArgumentsBaseUnits {}; - class ModuleDescription {}; - }; - class GVAR(dagrModule): Module_F { + class ACE_Module; + class GVAR(dagrModule): ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Dagr_Module_DisplayName"; @@ -62,7 +58,7 @@ class CfgVehicles { }; }; }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_Dagr_Module_Description"; }; }; diff --git a/addons/mk6mortar/CfgVehicles.hpp b/addons/mk6mortar/CfgVehicles.hpp index e4a9d0f2a5..5708f3c670 100644 --- a/addons/mk6mortar/CfgVehicles.hpp +++ b/addons/mk6mortar/CfgVehicles.hpp @@ -43,11 +43,8 @@ class CfgVehicles { }; }; - class Logic; - class Module_F: Logic { - class ModuleDescription {}; - }; - class GVAR(module): Module_F { + class ACE_Module; + class GVAR(module): ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_mk6mortar_Module_DisplayName"; @@ -76,7 +73,7 @@ class CfgVehicles { defaultValue = 1; }; }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_mk6mortar_Module_Description"; }; }; diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index fabd3b09cb..50439218aa 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -1,9 +1,6 @@ class CfgVehicles { - class Logic; - class Module_F: Logic { - class ModuleDescription {}; - }; - class ACE_ModuleNameTags : Module_F { + class ACE_Module; + class ACE_ModuleNameTags: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_NameTags_Module_DisplayName"; @@ -65,7 +62,7 @@ class CfgVehicles { defaultValue = 0; }; }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_NameTags_Module_Description"; }; }; diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index e90f4ba08e..6fd60e6321 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -1,9 +1,6 @@ class CfgVehicles { - class Logic; - class Module_F: Logic { - class ModuleDescription {}; - }; - class ACE_ModuleRespawn: Module_F { + class ACE_Module; + class ACE_ModuleRespawn: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Respawn_Module_DisplayName"; @@ -27,12 +24,12 @@ class CfgVehicles { defaultValue = 1; }; }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_Respawn_Module_Description"; }; }; - class ACE_ModuleFriendlyFire: Module_F { + class ACE_ModuleFriendlyFire: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_FriendlyFire_Module_DisplayName"; @@ -42,12 +39,12 @@ class CfgVehicles { icon = QUOTE(PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa)); class Arguments {}; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_FriendlyFire_Module_Description"; }; }; - class ACE_ModuleRallypoint: Module_F { + class ACE_ModuleRallypoint: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_Rallypoint_Module_DisplayName"; @@ -57,7 +54,7 @@ class CfgVehicles { icon = QUOTE(PATHTOF(UI\Icon_Module_Rallypoint_ca.paa)); class Arguments {}; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_Rallypoint_Module_Description"; }; }; diff --git a/addons/switchunits/CfgVehicles.hpp b/addons/switchunits/CfgVehicles.hpp index 0f76c78568..d2548448b1 100644 --- a/addons/switchunits/CfgVehicles.hpp +++ b/addons/switchunits/CfgVehicles.hpp @@ -1,6 +1,6 @@ class CfgVehicles { - class Module_F; - class ACE_ModuleSwitchUnits: Module_F { + class ACE_Module; + class ACE_ModuleSwitchUnits: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_SwitchUnits_Module_DisplayName"; diff --git a/addons/vehiclelock/CfgVehicles.hpp b/addons/vehiclelock/CfgVehicles.hpp index 60cb67d4c4..1230fd5221 100644 --- a/addons/vehiclelock/CfgVehicles.hpp +++ b/addons/vehiclelock/CfgVehicles.hpp @@ -62,11 +62,8 @@ class CfgVehicles { MACRO_LOCK_ACTIONS }; - class Logic; - class Module_F: Logic { - class ModuleDescription {}; - }; - class ACE_VehicleLock_ModuleSetup: Module_F { + class ACE_Module; + class ACE_VehicleLock_ModuleSetup: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_VehicleLock_Module_DisplayName"; @@ -99,12 +96,12 @@ class CfgVehicles { defaultValue = "10"; }; }; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_VehicleLock_Module_Description"; }; }; - class ACE_VehicleLock_ModuleSyncedAssign: Module_F { + class ACE_VehicleLock_ModuleSyncedAssign: ACE_Module { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_DisplayName"; @@ -114,7 +111,7 @@ class CfgVehicles { icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleKey_ca.paa)); functionPriority = 0; class Arguments {}; - class ModuleDescription: ModuleDescription { + class ModuleDescription { description = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_Description"; sync[] = {"AnyPlayer", "AnyVehicle"}; };