diff --git a/addons/settings/XEH_preInit.sqf b/addons/settings/XEH_preInit.sqf index 590de052b..5af03c6d8 100644 --- a/addons/settings/XEH_preInit.sqf +++ b/addons/settings/XEH_preInit.sqf @@ -63,12 +63,4 @@ if (isServer) then { }] call CBA_fnc_addEventHandler; }; -// import settings from file if filepatching is enabled -if (isFilePatchingEnabled) then { - [loadFile PATH_SETTINGS_FILE, "client"] call FUNC(import); - diag_log text "[CBA] (settings): Settings file loaded."; -} else { - diag_log text "[CBA] (settings): Cannot load settings file. File patching disabled. Use -filePatching flag."; -}; - ADDON = true; diff --git a/addons/settings/script_component.hpp b/addons/settings/script_component.hpp index 616e5ee6c..d8e29d4ab 100644 --- a/addons/settings/script_component.hpp +++ b/addons/settings/script_component.hpp @@ -15,8 +15,6 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_SETTINGS #endif -#define PATH_SETTINGS_FILE "userconfig\cba\settings.sqf" - #define IDC_ADDONS_GROUP 4301 #define IDC_BTN_CONFIGURE_ADDONS 4302 #define IDC_BTN_CLIENT 9000 diff --git a/addons/settings_helper/$PBOPREFIX$ b/addons/settings_helper/$PBOPREFIX$ deleted file mode 100644 index 4001f2a4a..000000000 --- a/addons/settings_helper/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -userconfig/ diff --git a/addons/settings_helper/$SCRIPTSFOLDER$ b/addons/settings_helper/$SCRIPTSFOLDER$ deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/settings_helper/cba/settings.sqf b/addons/settings_helper/cba/settings.sqf deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/settings_helper/config.cpp b/addons/settings_helper/config.cpp deleted file mode 100644 index 66c7f2b70..000000000 --- a/addons/settings_helper/config.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// the purpose of this PBO is to set a default file to the following path: -// userconfig/cba/settings.sqf -// this way we effectively make the file optional, as the loadFile command -// can fall back to this empty default file - -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - author = "$STR_CBA_Author"; - name = ECSTRING(settings,component); - url = "$STR_CBA_URL"; - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {}; - version = VERSION; - }; -}; diff --git a/addons/settings_helper/script_component.hpp b/addons/settings_helper/script_component.hpp deleted file mode 100644 index 254e5c3b1..000000000 --- a/addons/settings_helper/script_component.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#define COMPONENT settings_helper -#include "\x\cba\addons\main\script_mod.hpp" -#include "\x\cba\addons\main\script_macros.hpp"