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 circular dependency - ModuleDescription

Browse Source
This commit is contained in:
PabstMirror 2015-05-30 00:31:07 -05:00
parent 9d29aa2107
commit 84d940e69d
8 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/advanced_ballistics/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_ballistics", "ace_weather", "ace_modules"}; requiredAddons[] = {"ace_ballistics", "ace_weather"};
author[] = {"Ruthberg"}; author[] = {"Ruthberg"};
authorUrl = "https://github.com/ulteq"; authorUrl = "https://github.com/ulteq";
VERSION_CONFIG; VERSION_CONFIG;

11
addons/common/CfgVehicles.hpp
View File

@ -24,8 +24,11 @@ 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 ModuleDescription;
};
class ACE_Module: Module_F {};
class ACE_ModuleCheckPBOs: ACE_Module { class ACE_ModuleCheckPBOs: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
@ -69,7 +72,7 @@ class CfgVehicles {
}; };
}; };
}; };
class ModuleDescription { class ModuleDescription: ModuleDescription {
description = "$STR_ACE_Common_CheckPBO_Description"; description = "$STR_ACE_Common_CheckPBO_Description";
}; };
}; };
@ -84,7 +87,7 @@ class CfgVehicles {
isGlobal = 1; isGlobal = 1;
class Arguments { class Arguments {
}; };
class ModuleDescription { class ModuleDescription: ModuleDescription {
description = "$STR_ACE_Common_LSDVehicles_Description"; description = "$STR_ACE_Common_LSDVehicles_Description";
sync[] = {"AnyVehicle"}; sync[] = {"AnyVehicle"};
}; };

2
addons/explosives/CfgModule.hpp
View File

@ -21,7 +21,7 @@ class ACE_ModuleExplosive: ACE_Module {
defaultValue = 1; defaultValue = 1;
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription {
description = "$STR_ACE_Explosive_Module_Description"; description = "$STR_ACE_Explosive_Module_Description";
}; };
}; };

2
addons/medical/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {"ACE_medicalSupplyCrate", "ACE_medicalSupplyCrate_advanced", "ACE_fieldDressingItem", "ACE_packingBandageItem", "ACE_elasticBandageItem", "ACE_tourniquetItem", "ACE_morphineItem", "ACE_atropineItem", "ACE_epinephrineItem", "ACE_plasmaIVItem", "ACE_bloodIVItem", "ACE_salineIVItem", "ACE_quikclotItem", "ACE_personalAidKitItem", "ACE_surgicalKitItem", "ACE_bodyBagItem", "ACE_bodyBagObject"}; units[] = {"ACE_medicalSupplyCrate", "ACE_medicalSupplyCrate_advanced", "ACE_fieldDressingItem", "ACE_packingBandageItem", "ACE_elasticBandageItem", "ACE_tourniquetItem", "ACE_morphineItem", "ACE_atropineItem", "ACE_epinephrineItem", "ACE_plasmaIVItem", "ACE_bloodIVItem", "ACE_salineIVItem", "ACE_quikclotItem", "ACE_personalAidKitItem", "ACE_surgicalKitItem", "ACE_bodyBagItem", "ACE_bodyBagObject"};
weapons[] = {"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_tourniquet", "ACE_morphine", "ACE_atropine", "ACE_epinephrine", "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250", "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250", "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250", "ACE_quikclot", "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag"}; weapons[] = {"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_tourniquet", "ACE_morphine", "ACE_atropine", "ACE_epinephrine", "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250", "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250", "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250", "ACE_quikclot", "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag"};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction","ace_modules", "ace_apl"}; requiredAddons[] = {"ace_interaction", "ace_apl"};
author[] = {"Glowbal", "KoffeinFlummi"}; author[] = {"Glowbal", "KoffeinFlummi"};
authorUrl = ""; authorUrl = "";
VERSION_CONFIG; VERSION_CONFIG;

2
addons/modules/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {};
author[] = {"Glowbal"}; author[] = {"Glowbal"};
authorUrl = ""; authorUrl = "";
VERSION_CONFIG; VERSION_CONFIG;

8
addons/vehiclelock/CfgVehicles.hpp
View File

@ -62,7 +62,11 @@ class CfgVehicles {
MACRO_LOCK_ACTIONS MACRO_LOCK_ACTIONS
}; };
class ACE_Module; class Logic;
class Module_F: Logic {
class ModuleDescription;
};
class ACE_Module: Module_F {};
class ACE_VehicleLock_ModuleSetup: ACE_Module { class ACE_VehicleLock_ModuleSetup: ACE_Module {
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
@ -111,7 +115,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 { class ModuleDescription: ModuleDescription {
description = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_Description"; description = "$STR_ACE_VehicleLock_VehicleKeyAssign_Module_Description";
sync[] = {"AnyPlayer", "AnyVehicle"}; sync[] = {"AnyPlayer", "AnyVehicle"};
}; };

2
addons/weather/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common", "ace_modules"}; requiredAddons[] = {"ace_common"};
author[] = {"q1184", "Rocko", "esteldunedain", "Ruthberg"}; author[] = {"q1184", "Rocko", "esteldunedain", "Ruthberg"};
VERSION_CONFIG; VERSION_CONFIG;
}; };

2
addons/zeus/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common","ace_modules"}; requiredAddons[] = {"ace_common"};
author[] = {"SilentSpike"}; author[] = {"SilentSpike"};
authorUrl = "https://github.com/SilentSpike"; authorUrl = "https://github.com/SilentSpike";
VERSION_CONFIG; VERSION_CONFIG;