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

- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.

Browse Source 
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
This commit is contained in:
esteldunedain 2015-05-30 01:37:41 -03:00
parent 333cb80171
commit 9d29aa2107
12 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/common/CfgVehicles.hpp
View File

@ -25,11 +25,8 @@ class CfgVehicles {
// += needs a non inherited entry in that class, otherwise it simply overwrites // += needs a non inherited entry in that class, otherwise it simply overwrites
//#include <DefaultItems.hpp> //#include <DefaultItems.hpp>
class Logic; class ACE_Module;
class Module_F: Logic { class ACE_ModuleCheckPBOs: ACE_Module {
class ModuleDescription {};
};
class ACE_ModuleCheckPBOs: Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Common_CheckPBO_DisplayName"; displayName = "$STR_ACE_Common_CheckPBO_DisplayName";
@ -72,12 +69,12 @@ class CfgVehicles {
}; };
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_Common_CheckPBO_Description"; description = "$STR_ACE_Common_CheckPBO_Description";
}; };
}; };
class ACE_ModuleLSDVehicles: Module_F { class ACE_ModuleLSDVehicles: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Common_LSDVehicles_DisplayName"; displayName = "$STR_ACE_Common_LSDVehicles_DisplayName";
@ -87,7 +84,7 @@ class CfgVehicles {
isGlobal = 1; isGlobal = 1;
class Arguments { class Arguments {
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_Common_LSDVehicles_Description"; description = "$STR_ACE_Common_LSDVehicles_Description";
sync[] = {"AnyVehicle"}; sync[] = {"AnyVehicle"};
}; };

2
addons/common/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; units[] = {"ACE_Box_Misc", "ACE_bananaItem"};
weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main"}; requiredAddons[] = {"ace_main","ace_modules"};
author[] = {"KoffeinFlummi"}; author[] = {"KoffeinFlummi"};
authorUrl = "https://github.com/KoffeinFlummi/"; authorUrl = "https://github.com/KoffeinFlummi/";
VERSION_CONFIG; VERSION_CONFIG;

7
addons/explosives/CfgModule.hpp
View File

@ -1,8 +1,5 @@
class Logic; class ACE_Module;
class Module_F: Logic { class ACE_ModuleExplosive: ACE_Module {
class ModuleDescription {};
};
class ACE_ModuleExplosive: Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Explosive_Module_DisplayName"; displayName = "$STR_ACE_Explosive_Module_DisplayName";

4
addons/hearing/CfgVehicles.hpp
View File

@ -94,8 +94,8 @@ class CfgVehicles {
}; };
class Module_F; class ACE_Module;
class ACE_ModuleHearing: Module_F { class ACE_ModuleHearing: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Hearing_Module_DisplayName"; displayName = "$STR_ACE_Hearing_Module_DisplayName";

4
addons/interaction/CfgVehicles.hpp
View File

@ -1,7 +1,7 @@
class CfgVehicles { class CfgVehicles {
class Module_F; class ACE_Module;
class ACE_ModuleInteraction: Module_F { class ACE_ModuleInteraction: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_InteractionSystem_Module_DisplayName"; displayName = "$STR_ACE_InteractionSystem_Module_DisplayName";

6
addons/map/CfgVehicles.hpp
View File

@ -1,6 +1,7 @@
class CfgVehicles { class CfgVehicles {
class Module_F;
class ACE_ModuleMap: Module_F { class ACE_Module;
class ACE_ModuleMap: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Map_Module_DisplayName"; displayName = "$STR_ACE_Map_Module_DisplayName";
@ -39,6 +40,7 @@ class CfgVehicles {
}; };
}; };
class Module_F;
class ACE_ModuleBlueForceTracking: Module_F { class ACE_ModuleBlueForceTracking: Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";

10
addons/microdagr/CfgVehicles.hpp
View File

@ -36,12 +36,8 @@ class CfgVehicles {
}; };
}; };
class Logic; class ACE_Module;
class Module_F: Logic { class GVAR(dagrModule): ACE_Module {
class ArgumentsBaseUnits {};
class ModuleDescription {};
};
class GVAR(dagrModule): Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Dagr_Module_DisplayName"; displayName = "$STR_ACE_Dagr_Module_DisplayName";
@ -62,7 +58,7 @@ class CfgVehicles {
}; };
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_Dagr_Module_Description"; description = "$STR_ACE_Dagr_Module_Description";
}; };
}; };

9
addons/mk6mortar/CfgVehicles.hpp
View File

@ -43,11 +43,8 @@ class CfgVehicles {
}; };
}; };
class Logic; class ACE_Module;
class Module_F: Logic { class GVAR(module): ACE_Module {
class ModuleDescription {};
};
class GVAR(module): Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_mk6mortar_Module_DisplayName"; displayName = "$STR_ACE_mk6mortar_Module_DisplayName";
@ -76,7 +73,7 @@ class CfgVehicles {
defaultValue = 1; defaultValue = 1;
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_mk6mortar_Module_Description"; description = "$STR_ACE_mk6mortar_Module_Description";
}; };
}; };

9
addons/nametags/CfgVehicles.hpp
View File

@ -1,9 +1,6 @@
class CfgVehicles { class CfgVehicles {
class Logic; class ACE_Module;
class Module_F: Logic { class ACE_ModuleNameTags: ACE_Module {
class ModuleDescription {};
};
class ACE_ModuleNameTags : Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_NameTags_Module_DisplayName"; displayName = "$STR_ACE_NameTags_Module_DisplayName";
@ -65,7 +62,7 @@ class CfgVehicles {
defaultValue = 0; defaultValue = 0;
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_NameTags_Module_Description"; description = "$STR_ACE_NameTags_Module_Description";
}; };
}; };

17
addons/respawn/CfgVehicles.hpp
View File

@ -1,9 +1,6 @@
class CfgVehicles { class CfgVehicles {
class Logic; class ACE_Module;
class Module_F: Logic { class ACE_ModuleRespawn: ACE_Module {
class ModuleDescription {};
};
class ACE_ModuleRespawn: Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Respawn_Module_DisplayName"; displayName = "$STR_ACE_Respawn_Module_DisplayName";
@ -27,12 +24,12 @@ class CfgVehicles {
defaultValue = 1; defaultValue = 1;
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_Respawn_Module_Description"; description = "$STR_ACE_Respawn_Module_Description";
}; };
}; };
class ACE_ModuleFriendlyFire: Module_F { class ACE_ModuleFriendlyFire: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_FriendlyFire_Module_DisplayName"; displayName = "$STR_ACE_FriendlyFire_Module_DisplayName";
@ -42,12 +39,12 @@ class CfgVehicles {
icon = QUOTE(PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa)); icon = QUOTE(PATHTOF(UI\Icon_Module_FriendlyFire_ca.paa));
class Arguments {}; class Arguments {};
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_FriendlyFire_Module_Description"; description = "$STR_ACE_FriendlyFire_Module_Description";
}; };
}; };
class ACE_ModuleRallypoint: Module_F { class ACE_ModuleRallypoint: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_Rallypoint_Module_DisplayName"; displayName = "$STR_ACE_Rallypoint_Module_DisplayName";
@ -57,7 +54,7 @@ class CfgVehicles {
icon = QUOTE(PATHTOF(UI\Icon_Module_Rallypoint_ca.paa)); icon = QUOTE(PATHTOF(UI\Icon_Module_Rallypoint_ca.paa));
class Arguments {}; class Arguments {};
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_Rallypoint_Module_Description"; description = "$STR_ACE_Rallypoint_Module_Description";
}; };
}; };

4
addons/switchunits/CfgVehicles.hpp
View File

@ -1,6 +1,6 @@
class CfgVehicles { class CfgVehicles {
class Module_F; class ACE_Module;
class ACE_ModuleSwitchUnits: Module_F { class ACE_ModuleSwitchUnits: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_SwitchUnits_Module_DisplayName"; displayName = "$STR_ACE_SwitchUnits_Module_DisplayName";

13
addons/vehiclelock/CfgVehicles.hpp
View File

@ -62,11 +62,8 @@ class CfgVehicles {
MACRO_LOCK_ACTIONS MACRO_LOCK_ACTIONS
}; };
class Logic; class ACE_Module;
class Module_F: Logic { class ACE_VehicleLock_ModuleSetup: ACE_Module {
class ModuleDescription {};
};
class ACE_VehicleLock_ModuleSetup: Module_F {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_VehicleLock_Module_DisplayName"; displayName = "$STR_ACE_VehicleLock_Module_DisplayName";
@ -99,12 +96,12 @@ class CfgVehicles {
defaultValue = "10"; defaultValue = "10";
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_VehicleLock_Module_Description"; description = "$STR_ACE_VehicleLock_Module_Description";
}; };
}; };
class ACE_VehicleLock_ModuleSyncedAssign: Module_F { class ACE_VehicleLock_ModuleSyncedAssign: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_DisplayName"; displayName = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_DisplayName";
@ -114,7 +111,7 @@ class CfgVehicles {
icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleKey_ca.paa)); icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleKey_ca.paa));
functionPriority = 0; functionPriority = 0;
class Arguments {}; class Arguments {};
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_Description"; description = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_Description";
sync[] = {"AnyPlayer", "AnyVehicle"}; sync[] = {"AnyPlayer", "AnyVehicle"};
}; };