From 2dabc6779bb578177eaa9786ff28e61726034e0e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 29 Jun 2019 11:41:26 -0500 Subject: [PATCH] Accessiblity - Allow changing marker colors --- addons/accessiblity/$PBOPREFIX$ | 1 + addons/accessiblity/CfgEventhandlers.hpp | 5 +++++ addons/accessiblity/CfgMarkerColors.hpp | 14 +++++++++++++ addons/accessiblity/XEH_preInit.sqf | 7 +++++++ addons/accessiblity/config.cpp | 17 ++++++++++++++++ addons/accessiblity/initSettings.sqf | 26 ++++++++++++++++++++++++ addons/accessiblity/script_component.hpp | 14 +++++++++++++ addons/accessiblity/stringtable.xml | 5 +++++ 8 files changed, 89 insertions(+) create mode 100644 addons/accessiblity/$PBOPREFIX$ create mode 100644 addons/accessiblity/CfgEventhandlers.hpp create mode 100644 addons/accessiblity/CfgMarkerColors.hpp create mode 100644 addons/accessiblity/XEH_preInit.sqf create mode 100644 addons/accessiblity/config.cpp create mode 100644 addons/accessiblity/initSettings.sqf create mode 100644 addons/accessiblity/script_component.hpp create mode 100644 addons/accessiblity/stringtable.xml diff --git a/addons/accessiblity/$PBOPREFIX$ b/addons/accessiblity/$PBOPREFIX$ new file mode 100644 index 0000000000..7c917fe6fb --- /dev/null +++ b/addons/accessiblity/$PBOPREFIX$ @@ -0,0 +1 @@ +x\cba\addons\accessiblity diff --git a/addons/accessiblity/CfgEventhandlers.hpp b/addons/accessiblity/CfgEventhandlers.hpp new file mode 100644 index 0000000000..b928bc2de6 --- /dev/null +++ b/addons/accessiblity/CfgEventhandlers.hpp @@ -0,0 +1,5 @@ +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_preInit)); + }; +}; diff --git a/addons/accessiblity/CfgMarkerColors.hpp b/addons/accessiblity/CfgMarkerColors.hpp new file mode 100644 index 0000000000..a3131ea17d --- /dev/null +++ b/addons/accessiblity/CfgMarkerColors.hpp @@ -0,0 +1,14 @@ +#define GET_COLOR(index,varName,defaultR,defaultG,defaultB) QUOTE((missionNamespace getVariable [ARR_2(QQGVAR(varName), [ARR_3(defaultR,defaultG,defaultB)])]) select index) + +class CfgMarkerColors { + class Default; + class ColorRed: Default { + color[] = {GET_COLOR(0,red,1,0,0), GET_COLOR(1,red,1,0,0), GET_COLOR(2,red,1,0,0), 1}; + }; + class ColorGreen: Default { + color[] = {GET_COLOR(0,green,0,1,0), GET_COLOR(1,green,0,1,0), GET_COLOR(2,green,0,1,0), 1}; + }; + class ColorBlue: Default { + color[] = {GET_COLOR(0,blue,0,0,1), GET_COLOR(1,blue,0,0,1), GET_COLOR(2,blue,0,0,1), 1}; + }; +}; diff --git a/addons/accessiblity/XEH_preInit.sqf b/addons/accessiblity/XEH_preInit.sqf new file mode 100644 index 0000000000..a27597ddeb --- /dev/null +++ b/addons/accessiblity/XEH_preInit.sqf @@ -0,0 +1,7 @@ +#include "script_component.hpp" + +ADDON = false; + +#include "initSettings.sqf" + +ADDON = true; diff --git a/addons/accessiblity/config.cpp b/addons/accessiblity/config.cpp new file mode 100644 index 0000000000..9471db8ff2 --- /dev/null +++ b/addons/accessiblity/config.cpp @@ -0,0 +1,17 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + author = "$STR_CBA_Author"; + name = CSTRING(component); + url = "$STR_CBA_URL"; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"cba_settings"}; + version = VERSION; + }; +}; + +#include "CfgEventhandlers.hpp" +#include "CfgMarkerColors.hpp" diff --git a/addons/accessiblity/initSettings.sqf b/addons/accessiblity/initSettings.sqf new file mode 100644 index 0000000000..e4c6c8fd04 --- /dev/null +++ b/addons/accessiblity/initSettings.sqf @@ -0,0 +1,26 @@ +[ +QGVAR(red), "COLOR", +["str_team_red"], +["CBA Accessiblity"], +[0.9, 0, 0, 1], +2, // setting can't be overwritten +{TRACE_1("red",_this);} +] call CBA_settings_fnc_init; + +[ +QGVAR(blue), "COLOR", +["str_team_blue"], +["CBA Accessiblity"], +[0, 0, 1, 1], +2, // setting can't be overwritten +{TRACE_1("blue",_this);} +] call CBA_settings_fnc_init; + +[ +QGVAR(green), "COLOR", +["str_team_green"], +["CBA Accessiblity"], +[0, 0.8, 0, 1], +2, // setting can't be overwritten +{TRACE_1("green",_this);} +] call CBA_settings_fnc_init; diff --git a/addons/accessiblity/script_component.hpp b/addons/accessiblity/script_component.hpp new file mode 100644 index 0000000000..e239634193 --- /dev/null +++ b/addons/accessiblity/script_component.hpp @@ -0,0 +1,14 @@ +#define COMPONENT accessiblity +#include "\x\cba\addons\main\script_mod.hpp" + +#define DEBUG_MODE_FULL + +#ifdef DEBUG_ENABLED_ACCESSIBLITY + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_HELP + #define DEBUG_SETTINGS DEBUG_SETTINGS_ACCESSIBLITY +#endif + +#include "\x\cba\addons\main\script_macros.hpp" diff --git a/addons/accessiblity/stringtable.xml b/addons/accessiblity/stringtable.xml new file mode 100644 index 0000000000..8f8216ab1c --- /dev/null +++ b/addons/accessiblity/stringtable.xml @@ -0,0 +1,5 @@ + + + + +