From 31adb5a9fcc484d0de9c1bdd0aec5408f2bad774 Mon Sep 17 00:00:00 2001 From: SAM Date: Thu, 14 May 2015 20:59:25 +0200 Subject: [PATCH] Second batch of settings files --- addons/explosives/ACE_Settings.hpp | 10 ++++ addons/explosives/config.cpp | 11 +--- addons/goggles/ACE_Settings.hpp | 8 +++ addons/goggles/config.cpp | 9 +-- addons/hearing/ACE_Settings.hpp | 20 +++++++ addons/hearing/config.cpp | 21 +------ addons/interact_menu/ACE_Settings.hpp | 72 ++++++++++++++++++++++++ addons/interact_menu/config.cpp | 73 +------------------------ addons/magazinerepack/ACE_Settings.hpp | 17 ++++++ addons/magazinerepack/config.cpp | 19 +------ addons/map/ACE_Settings.hpp | 30 ++++++++++ addons/map/config.cpp | 32 +---------- addons/maptools/ACE_Settings.hpp | 6 ++ addons/maptools/config.cpp | 7 +-- addons/mk6mortar/ACE_Settings.hpp | 18 ++++++ addons/mk6mortar/config.cpp | 20 +------ addons/nametags/config.cpp | 76 -------------------------- addons/optionsmenu/ACE_Settings.hpp | 9 +++ addons/optionsmenu/config.cpp | 11 +--- addons/overheating/ACE_Settings.hpp | 9 +++ addons/overheating/config.cpp | 10 +--- addons/reload/ACE_Settings.hpp | 9 +++ addons/reload/config.cpp | 11 +--- addons/respawn/ACE_Settings.hpp | 14 +++++ addons/respawn/config.cpp | 16 +----- addons/switchunits/ACE_Settings.hpp | 30 ++++++++++ addons/switchunits/config.cpp | 32 +---------- 27 files changed, 265 insertions(+), 335 deletions(-) create mode 100644 addons/explosives/ACE_Settings.hpp create mode 100644 addons/goggles/ACE_Settings.hpp create mode 100644 addons/hearing/ACE_Settings.hpp create mode 100644 addons/interact_menu/ACE_Settings.hpp create mode 100644 addons/magazinerepack/ACE_Settings.hpp create mode 100644 addons/map/ACE_Settings.hpp create mode 100644 addons/maptools/ACE_Settings.hpp create mode 100644 addons/mk6mortar/ACE_Settings.hpp delete mode 100644 addons/nametags/config.cpp create mode 100644 addons/optionsmenu/ACE_Settings.hpp create mode 100644 addons/overheating/ACE_Settings.hpp create mode 100644 addons/reload/ACE_Settings.hpp create mode 100644 addons/respawn/ACE_Settings.hpp create mode 100644 addons/switchunits/ACE_Settings.hpp diff --git a/addons/explosives/ACE_Settings.hpp b/addons/explosives/ACE_Settings.hpp new file mode 100644 index 0000000000..038f06291d --- /dev/null +++ b/addons/explosives/ACE_Settings.hpp @@ -0,0 +1,10 @@ +class ACE_Settings { + class GVAR(RequireSpecialist) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(PunishNonSpecialists) { + value = 1; + typeName = "BOOL"; + }; +}; diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index e77d2bf624..873c4e0dc3 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -40,13 +40,4 @@ class CfgMineTriggers { }; }; -class ACE_Settings { - class GVAR(RequireSpecialist) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(PunishNonSpecialists) { - value = 1; - typeName = "BOOL"; - }; -}; +#include "ACE_Settings.hpp" diff --git a/addons/goggles/ACE_Settings.hpp b/addons/goggles/ACE_Settings.hpp new file mode 100644 index 0000000000..e25da3c274 --- /dev/null +++ b/addons/goggles/ACE_Settings.hpp @@ -0,0 +1,8 @@ +class ACE_Settings { + class GVAR(showInThirdPerson) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Goggles_ShowInThirdPerson"; + }; +}; diff --git a/addons/goggles/config.cpp b/addons/goggles/config.cpp index 7e8afe4d3d..c557827e17 100644 --- a/addons/goggles/config.cpp +++ b/addons/goggles/config.cpp @@ -243,14 +243,7 @@ class SniperCloud { ACE_Goggles_BulletCount = 1; }; -class ACE_Settings { - class GVAR(showInThirdPerson) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Goggles_ShowInThirdPerson"; - }; -}; +#include "ACE_Settings.hpp" class CfgCloudlets { class Default; diff --git a/addons/hearing/ACE_Settings.hpp b/addons/hearing/ACE_Settings.hpp new file mode 100644 index 0000000000..a196b4affc --- /dev/null +++ b/addons/hearing/ACE_Settings.hpp @@ -0,0 +1,20 @@ +class ACE_Settings { + class GVAR(EnableCombatDeafness) { + value = 1; + typeName = "BOOL"; + }; + class GVAR(EarplugsVolume) { + value = 0.5; + typeName = "SCALAR"; + }; + class GVAR(UnconsciousnessVolume) { + value = 0.4; + typeName = "SCALAR"; + }; + class GVAR(DisableEarRinging) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Hearing_DisableEarRinging"; + }; +}; diff --git a/addons/hearing/config.cpp b/addons/hearing/config.cpp index 0813d0648e..777c44dd8f 100644 --- a/addons/hearing/config.cpp +++ b/addons/hearing/config.cpp @@ -22,23 +22,4 @@ class CfgPatches { #include "CfgAmmo.hpp" -class ACE_Settings { - class GVAR(EnableCombatDeafness) { - value = 1; - typeName = "BOOL"; - }; - class GVAR(EarplugsVolume) { - value = 0.5; - typeName = "SCALAR"; - }; - class GVAR(UnconsciousnessVolume) { - value = 0.4; - typeName = "SCALAR"; - }; - class GVAR(DisableEarRinging) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Hearing_DisableEarRinging"; - }; -}; +#include "ACE_Settings.hpp" diff --git a/addons/interact_menu/ACE_Settings.hpp b/addons/interact_menu/ACE_Settings.hpp new file mode 100644 index 0000000000..19347b0d6d --- /dev/null +++ b/addons/interact_menu/ACE_Settings.hpp @@ -0,0 +1,72 @@ +class ACE_Settings { + class GVAR(AlwaysUseCursorSelfInteraction) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorSelfInteraction"; + }; + class GVAR(cursorKeepCentered) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_cursorKeepCentered"; + description = "$STR_ACE_Interact_cursorKeepCenteredDescription"; + }; + class GVAR(AlwaysUseCursorInteraction) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorInteraction"; + }; + class GVAR(UseListMenu) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_UseListMenu"; + }; + class GVAR(colorTextMax) { + value[] = {1, 1, 1, 1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_ColorTextMax"; + }; + class GVAR(colorTextMin) { + value[] = {1, 1, 1, 0.25}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_ColorTextMin"; + }; + class GVAR(colorShadowMax) { + value[] = {0, 0, 0, 1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_ColorShadowMax"; + }; + class GVAR(colorShadowMin) { + value[] = {0, 0, 0, 0.25}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_ColorShadowMin"; + }; + class GVAR(textSize) { + value = 2; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_textSize"; + values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"}; + }; + class GVAR(shadowSetting) { + value = 2; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_shadowSetting"; + description = "$STR_ACE_Interact_shadowSettingDescription"; + values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_A3_OPTIONS_ENABLED", "$STR_ACE_Interact_shadowOutline"}; + }; + class GVAR(actionOnKeyRelease) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_ActionOnKeyRelease"; + }; +}; diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 52f2f6b9f9..c1da3392e9 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -18,78 +18,7 @@ class CfgPatches { #include "CursorMenus.hpp" -class ACE_Settings { - class GVAR(AlwaysUseCursorSelfInteraction) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorSelfInteraction"; - }; - class GVAR(cursorKeepCentered) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_cursorKeepCentered"; - description = "$STR_ACE_Interact_cursorKeepCenteredDescription"; - }; - class GVAR(AlwaysUseCursorInteraction) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorInteraction"; - }; - class GVAR(UseListMenu) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_UseListMenu"; - }; - class GVAR(colorTextMax) { - value[] = {1, 1, 1, 1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_ColorTextMax"; - }; - class GVAR(colorTextMin) { - value[] = {1, 1, 1, 0.25}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_ColorTextMin"; - }; - class GVAR(colorShadowMax) { - value[] = {0, 0, 0, 1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_ColorShadowMax"; - }; - class GVAR(colorShadowMin) { - value[] = {0, 0, 0, 0.25}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_ColorShadowMin"; - }; - class GVAR(textSize) { - value = 2; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_textSize"; - values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"}; - }; - class GVAR(shadowSetting) { - value = 2; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_shadowSetting"; - description = "$STR_ACE_Interact_shadowSettingDescription"; - values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_A3_OPTIONS_ENABLED", "$STR_ACE_Interact_shadowOutline"}; - }; - class GVAR(actionOnKeyRelease) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_ActionOnKeyRelease"; - }; -}; +#include "ACE_Settings.hpp" class ACE_Extensions { extensions[] += {"ace_break_line"}; diff --git a/addons/magazinerepack/ACE_Settings.hpp b/addons/magazinerepack/ACE_Settings.hpp new file mode 100644 index 0000000000..0b7b2d4628 --- /dev/null +++ b/addons/magazinerepack/ACE_Settings.hpp @@ -0,0 +1,17 @@ +class ACE_Settings { + //Time to move a round from one magazine to another + class GVAR(TimePerAmmo) { + value = 1.5; + typeName = "SCALAR"; + }; + //Time to swap between magazines when repacking + class GVAR(TimePerMagazine) { + value = 2.0; + typeName = "SCALAR"; + }; + //Time to relink 2 belts together + class GVAR(TimePerBeltLink) { + value = 8.0; + typeName = "SCALAR"; + }; +}; diff --git a/addons/magazinerepack/config.cpp b/addons/magazinerepack/config.cpp index 7c921889a1..47c0ac889c 100644 --- a/addons/magazinerepack/config.cpp +++ b/addons/magazinerepack/config.cpp @@ -15,21 +15,4 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgSounds.hpp" #include "CfgVehicles.hpp" - -class ACE_Settings { - //Time to move a round from one magazine to another - class GVAR(TimePerAmmo) { - value = 1.5; - typeName = "SCALAR"; - }; - //Time to swap between magazines when repacking - class GVAR(TimePerMagazine) { - value = 2.0; - typeName = "SCALAR"; - }; - //Time to relink 2 belts together - class GVAR(TimePerBeltLink) { - value = 8.0; - typeName = "SCALAR"; - }; -}; +#include "ACE_Settings.hpp" diff --git a/addons/map/ACE_Settings.hpp b/addons/map/ACE_Settings.hpp new file mode 100644 index 0000000000..15e2a174e4 --- /dev/null +++ b/addons/map/ACE_Settings.hpp @@ -0,0 +1,30 @@ +class ACE_Settings { + class GVAR(BFT_Interval) { + value = 1.0; + typeName = "SCALAR"; + }; + class GVAR(BFT_Enabled) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(BFT_HideAiGroups) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(mapIllumination) { + value = 1; + typeName = "BOOL"; + }; + class GVAR(mapShake) { + value = 1; + typeName = "BOOL"; + }; + class GVAR(mapLimitZoom) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(mapShowCursorCoordinates) { + value = 0; + typeName = "BOOL"; + }; +}; diff --git a/addons/map/config.cpp b/addons/map/config.cpp index 9d75eaa5c8..078c06b41d 100644 --- a/addons/map/config.cpp +++ b/addons/map/config.cpp @@ -23,37 +23,7 @@ class RscButtonMenuCancel; class RscButtonMenu; class RscEdit; -class ACE_Settings { - class GVAR(BFT_Interval) { - value = 1.0; - typeName = "SCALAR"; - }; - class GVAR(BFT_Enabled) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(BFT_HideAiGroups) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(mapIllumination) { - value = 1; - typeName = "BOOL"; - }; - class GVAR(mapShake) { - value = 1; - typeName = "BOOL"; - }; - class GVAR(mapLimitZoom) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(mapShowCursorCoordinates) { - value = 0; - typeName = "BOOL"; - }; -}; - +#include "ACE_Settings.hpp" #include "CfgEventHandlers.hpp" #include "CfgMarkers.hpp" #include "CfgVehicles.hpp" diff --git a/addons/maptools/ACE_Settings.hpp b/addons/maptools/ACE_Settings.hpp new file mode 100644 index 0000000000..9c53a84a7c --- /dev/null +++ b/addons/maptools/ACE_Settings.hpp @@ -0,0 +1,6 @@ +class ACE_Settings { + class GVAR(EveryoneCanDrawOnBriefing) { + value = 1; + typeName = "BOOL"; + }; +}; diff --git a/addons/maptools/config.cpp b/addons/maptools/config.cpp index ab11fdceec..1e82cd2269 100644 --- a/addons/maptools/config.cpp +++ b/addons/maptools/config.cpp @@ -12,12 +12,7 @@ class CfgPatches { }; }; -class ACE_Settings { - class GVAR(EveryoneCanDrawOnBriefing) { - value = 1; - typeName = "BOOL"; - }; -}; +#include "ACE_Settings.hpp" class RscControlsGroup; class RscActiveText; diff --git a/addons/mk6mortar/ACE_Settings.hpp b/addons/mk6mortar/ACE_Settings.hpp new file mode 100644 index 0000000000..be7625bc3a --- /dev/null +++ b/addons/mk6mortar/ACE_Settings.hpp @@ -0,0 +1,18 @@ +class ACE_Settings { + //These settings effect gameplay difficutly: defaults will leave the mortar the same as vanilla + class GVAR(airResistanceEnabled) { + value = 0; + typeName = "BOOL"; + isClientSetable = 0; + }; + class GVAR(allowComputerRangefinder) { + value = 1; + typeName = "BOOL"; + isClientSetable = 0; + }; + class GVAR(allowCompass) { + value = 1; + typeName = "BOOL"; + isClientSetable = 0; + }; +}; diff --git a/addons/mk6mortar/config.cpp b/addons/mk6mortar/config.cpp index 6751cea5fb..bbd7a2f892 100644 --- a/addons/mk6mortar/config.cpp +++ b/addons/mk6mortar/config.cpp @@ -26,22 +26,4 @@ class RscActiveText; #include "RscInGameUI.hpp" #include "RscRangeTable.hpp" - -class ACE_Settings { - //These settings effect gameplay difficutly: defaults will leave the mortar the same as vanilla - class GVAR(airResistanceEnabled) { - value = 0; - typeName = "BOOL"; - isClientSetable = 0; - }; - class GVAR(allowComputerRangefinder) { - value = 1; - typeName = "BOOL"; - isClientSetable = 0; - }; - class GVAR(allowCompass) { - value = 1; - typeName = "BOOL"; - isClientSetable = 0; - }; -}; +#include "ACE_Settings.hpp" diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp deleted file mode 100644 index b14873779c..0000000000 --- a/addons/nametags/config.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_interaction"}; - author[] = { "commy2", "esteldunedain" }; - authorUrl = "https://github.com/commy2/"; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" -#include "CfgVehicles.hpp" - -class ACE_Settings { - class GVAR(defaultNametagColor) { - value[] = {0.77, 0.51, 0.08, 1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_DefaultNametagColor"; - }; - class GVAR(showPlayerNames) { - value = 1; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowPlayerNames"; - description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; - values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_Enabled", "$STR_ACE_Common_OnlyCursor", "$STR_ACE_Common_OnlyOnKeypress", "$STR_ACE_Common_OnlyCursorAndKeyPress"}; - }; - class GVAR(showPlayerRanks) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowPlayerRanks"; - }; - class GVAR(showVehicleCrewInfo) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowVehicleCrewInfo"; - }; - class GVAR(showNamesForAI) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowNamesForAI"; - }; - class GVAR(showCursorTagForVehicles) { - value = 0; - typeName = "BOOL"; - isClientSettable = 0; - }; - class GVAR(showSoundWaves) { - value = 1; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowSoundWaves"; - description = "$STR_ACE_NameTags_ShowSoundWaves_Desc"; - values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_NameTagSettings", "$STR_ACE_Common_AlwaysShowAll"}; - }; - class GVAR(PlayerNamesViewDistance) { - value = 5; - typeName = "SCALAR"; - isClientSettable = 0; - }; - class GVAR(PlayerNamesMaxAlpha) { - value = 0.8; - typeName = "SCALAR"; - isClientSettable = 0; - }; -}; - -#include diff --git a/addons/optionsmenu/ACE_Settings.hpp b/addons/optionsmenu/ACE_Settings.hpp new file mode 100644 index 0000000000..ad910e4661 --- /dev/null +++ b/addons/optionsmenu/ACE_Settings.hpp @@ -0,0 +1,9 @@ +class ACE_Settings { + class GVAR(optionMenuDisplaySize) { + value = 0; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_optionsMenu_uiScaing"; + values[] = {"$str_medium", "$str_large", "$str_very_large"}; + }; +}; diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp index 36389568d3..17e4887db6 100644 --- a/addons/optionsmenu/config.cpp +++ b/addons/optionsmenu/config.cpp @@ -27,16 +27,7 @@ class CfgAddons { #include "gui\pauseMenu.hpp" #include "CfgVehicles.hpp" - -class ACE_Settings { - class GVAR(optionMenuDisplaySize) { - value = 0; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_optionsMenu_uiScaing"; - values[] = {"$str_medium", "$str_large", "$str_very_large"}; - }; -}; +#include "ACE_Settings.hpp" class ACE_Extensions { extensions[] += {"ace_clipboard"}; diff --git a/addons/overheating/ACE_Settings.hpp b/addons/overheating/ACE_Settings.hpp new file mode 100644 index 0000000000..f68898c434 --- /dev/null +++ b/addons/overheating/ACE_Settings.hpp @@ -0,0 +1,9 @@ +class ACE_Settings { + class GVAR(DisplayTextOnJam) { + typeName = "BOOL"; + isClientSettable = 1; + value = 1; + displayName = "$STR_ACE_overheating_SettingDisplayTextName"; + description = "$STR_ACE_overheating_SettingDisplayTextDesc"; + }; +}; diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp index bd6cdbbdd3..0e899e1b25 100644 --- a/addons/overheating/config.cpp +++ b/addons/overheating/config.cpp @@ -20,13 +20,5 @@ class CfgPatches { #include "CfgWeapons.hpp" -class ACE_Settings { - class GVAR(DisplayTextOnJam) { - typeName = "BOOL"; - isClientSettable = 1; - value = 1; - displayName = "$STR_ACE_overheating_SettingDisplayTextName"; - description = "$STR_ACE_overheating_SettingDisplayTextDesc"; - }; -}; +#include "ACE_Settings.hpp" diff --git a/addons/reload/ACE_Settings.hpp b/addons/reload/ACE_Settings.hpp new file mode 100644 index 0000000000..ce122a28f8 --- /dev/null +++ b/addons/reload/ACE_Settings.hpp @@ -0,0 +1,9 @@ +class ACE_Settings { + class GVAR(DisplayText) { + typeName = "BOOL"; + isClientSettable = 1; + value = 1; + displayName = "$STR_ACE_reload_SettingDisplayTextName"; + description = "$STR_ACE_reload_SettingDisplayTextDesc"; + }; +}; diff --git a/addons/reload/config.cpp b/addons/reload/config.cpp index 02f5014379..6ded1cd687 100644 --- a/addons/reload/config.cpp +++ b/addons/reload/config.cpp @@ -22,13 +22,4 @@ class CfgPatches { #include "RscInGameUI.hpp" -class ACE_Settings { - class GVAR(DisplayText) { - typeName = "BOOL"; - isClientSettable = 1; - value = 1; - displayName = "$STR_ACE_reload_SettingDisplayTextName"; - description = "$STR_ACE_reload_SettingDisplayTextDesc"; - }; -}; - +#include "ACE_Settings.hpp" diff --git a/addons/respawn/ACE_Settings.hpp b/addons/respawn/ACE_Settings.hpp new file mode 100644 index 0000000000..5c947b8670 --- /dev/null +++ b/addons/respawn/ACE_Settings.hpp @@ -0,0 +1,14 @@ +class ACE_Settings { + class GVAR(SavePreDeathGear) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(RemoveDeadBodiesDisconnected) { + value = 1; + typeName = "BOOL"; + }; + class GVAR(BodyRemoveTimer) { + value = 0; + typeName = "SCALAR"; + }; +}; diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index 05f4ee2aa8..daed5e2ab0 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -16,18 +16,4 @@ class CfgPatches { #include "CfgAddons.hpp" #include "CfgVehicleClasses.hpp" #include "CfgVehicles.hpp" - -class ACE_Settings { - class GVAR(SavePreDeathGear) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(RemoveDeadBodiesDisconnected) { - value = 1; - typeName = "BOOL"; - }; - class GVAR(BodyRemoveTimer) { - value = 0; - typeName = "SCALAR"; - }; -}; +#include "ACE_Settings.hpp" diff --git a/addons/switchunits/ACE_Settings.hpp b/addons/switchunits/ACE_Settings.hpp new file mode 100644 index 0000000000..06c1ff274c --- /dev/null +++ b/addons/switchunits/ACE_Settings.hpp @@ -0,0 +1,30 @@ +class ACE_Settings { + class GVAR(EnableSwitchUnits) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(SwitchToWest) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(SwitchToEast) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(SwitchToIndependent) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(SwitchToCivilian) { + value = 0; + typeName = "BOOL"; + }; + class GVAR(EnableSafeZone) { + value = 1; + typeName = "BOOL"; + }; + class GVAR(SafeZoneRadius) { + value = 100; + typeName = "SCALAR"; + }; +}; diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp index cda974d17e..8e792381c3 100644 --- a/addons/switchunits/config.cpp +++ b/addons/switchunits/config.cpp @@ -14,34 +14,4 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" - -class ACE_Settings { - class GVAR(EnableSwitchUnits) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(SwitchToWest) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(SwitchToEast) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(SwitchToIndependent) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(SwitchToCivilian) { - value = 0; - typeName = "BOOL"; - }; - class GVAR(EnableSafeZone) { - value = 1; - typeName = "BOOL"; - }; - class GVAR(SafeZoneRadius) { - value = 100; - typeName = "SCALAR"; - }; -}; +#include "ACE_Settings.hpp" \ No newline at end of file