diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp index 7fb540af2..34ec8b890 100644 --- a/cScripts/CfgFunctions.hpp +++ b/cScripts/CfgFunctions.hpp @@ -2,7 +2,6 @@ class cScripts { class init { file = "cScripts\functions\init"; class init_aceArsenal {}; - class init_aceTagging {}; class init_aceItemReplace {}; class init_skillAdjustment {}; diff --git a/cScripts/cScripts_preInit.sqf b/cScripts/cScripts_preInit.sqf index 670fbf9e0..24f1c47aa 100644 --- a/cScripts/cScripts_preInit.sqf +++ b/cScripts/cScripts_preInit.sqf @@ -9,7 +9,6 @@ INFO(if (is3DEN) then {"EDEN"} else {"preInit"}, "Initializing CBA Settings...") // Check installed moduels EGVAR(patches,usesACE) = isClass (configFile >> "CfgPatches" >> "ace_main"); EGVAR(patches,usesACEArsenal) = isClass (configFile >> "CfgPatches" >> "ace_arsenal"); -EGVAR(patches,usesACETagging) = isClass (configFile >> "CfgPatches" >> "ace_tagging"); EGVAR(patches,usesACEX) = isClass (configFile >> "CfgPatches" >> "acex_main"); EGVAR(patches,usesKat) = isClass (configFile >> "CfgPatches" >> "kat_main"); EGVAR(patches,usesACRE) = isClass (configFile >> "CfgPatches" >> "acre_sys_core"); @@ -46,10 +45,6 @@ EGVAR(PYLONS,DONE) = false; GVAR(PYLONS) = call EFUNC(init,pylons); EGVAR(PYLONS,DONE) = true; -if (EGVAR(Settings,allowCustomTagging)) then { - call EFUNC(init,aceTagging); -}; - call EFUNC(init,chatCommands); call EFUNC(init,zenModuels); diff --git a/cScripts/functions/init/fn_init_aceTagging.sqf b/cScripts/functions/init/fn_init_aceTagging.sqf deleted file mode 100644 index cb036ad06..000000000 --- a/cScripts/functions/init/fn_init_aceTagging.sqf +++ /dev/null @@ -1,44 +0,0 @@ -#include "..\script_component.hpp"; -/* - * Author: CPL.Brostrom.A - * This adds custom spray tags to all units. - * - * Example: - * call cScripts_fnc_init_aceTagging - * - * Public: No - */ - -if (!isServer) exitWith {}; -if (!EGVAR(patches,usesACETagging)) exitWith {}; -if (!isNil{missionNamespace getVariable QEGVAR(mission,tagging)}) exitWith {SHOW_WARNING("init", "Tagging already applied.")}; - -[ "cScripts_tagging_cav_black", - "Cav Black", - "ACE_SpraypaintBlack", - ["z\cav\addons\textures\data\tagging\tag_cav_black_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_black_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -[ "cScripts_tagging_cav_blue", - "Cav Blue", - "ACE_SpraypaintBlue", - ["z\cav\addons\textures\data\tagging\tag_cav_blue_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_blue_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -[ "cScripts_tagging_cav_green", - "Cav Green", - "ACE_SpraypaintGreen", - ["z\cav\addons\textures\data\tagging\tag_cav_green_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_green_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -[ "cScripts_tagging_cav_red", - "Cav Red", - "ACE_SpraypaintRed", - ["z\cav\addons\textures\data\tagging\tag_cav_red_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_red_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -missionNamespace setVariable [QEGVAR(mission,tagging), true]; diff --git a/cScripts/initSettings.inc.sqf b/cScripts/initSettings.inc.sqf index 240531abe..351810734 100644 --- a/cScripts/initSettings.inc.sqf +++ b/cScripts/initSettings.inc.sqf @@ -86,16 +86,6 @@ private _cScriptSettings = "cScripts Mission Settings"; {}, true ] call CBA_fnc_addSetting; -[ // Tagging - QEGVAR(Settings,allowCustomTagging), - "CHECKBOX", - ["Custom Tagging","Allow players to spray custom taggs."], - [_cScriptSettings, "3; Player"], - true, - true, - {}, - true -] call CBA_fnc_addSetting; [ // Insignia QEGVAR(Settings,allowInsigniaApplication), "CHECKBOX",