-
Notifications
You must be signed in to change notification settings - Fork 148
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add optional pbo to load settings from userconfig file #450
Changes from 2 commits
f5da218
a28ff0c
391895e
b21acec
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
x\cba\addons\auto_load_settings_file |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
|
||
class Extended_PreInit_EventHandlers { | ||
class ADDON { | ||
init = QUOTE(call COMPILE_FILE(XEH_preInit)); | ||
}; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#include "script_component.hpp" | ||
|
||
ADDON = false; | ||
|
||
// frame after preInit, but before postInit | ||
0 spawn { | ||
{ | ||
#include "loadSettingsFile.sqf" | ||
} call CBA_fnc_directCall; | ||
}; | ||
|
||
ADDON = true; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#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[] = {"cba_settings"}; | ||
version = VERSION; | ||
authors[] = {"commy2"}; | ||
}; | ||
}; | ||
|
||
#include "CfgEventHandlers.hpp" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
|
||
if (isFilePatchingEnabled) then { | ||
private _source = ["client", "server"] select (isMultiplayer && isServer); | ||
private _file = loadFile PATH_SETTINGS_FILE; | ||
|
||
if (_file != "") then { | ||
[_file, _source] call FUNC(import); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
and import calls There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. will fix |
||
diag_log text "[CBA] (settings): Settings file loaded."; | ||
} else { | ||
diag_log text "[CBA] (settings): Settings file not loaded. File empty or does not exist."; | ||
}; | ||
} else { | ||
diag_log text "[CBA] (settings): Cannot load settings file. File patching disabled. Use -filePatching flag."; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
#define COMPONENT auto_load_settings_file | ||
#include "\x\cba\addons\main\script_mod.hpp" | ||
|
||
//#define DEBUG_ENABLED_AUTO_LOAD_SETTINGS_FILE | ||
|
||
#ifdef DEBUG_ENABLED_AUTO_LOAD_SETTINGS_FILE | ||
#define DEBUG_MODE_FULL | ||
#endif | ||
|
||
#ifdef DEBUG_SETTINGS_AUTO_LOAD_SETTINGS_FILE | ||
#define DEBUG_SETTINGS DEBUG_SETTINGS_AUTO_LOAD_SETTINGS_FILE | ||
#endif | ||
|
||
#include "\x\cba\addons\main\script_macros.hpp" | ||
|
||
#define PATH_SETTINGS_FILE "userconfig\cba\settings.sqf" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it would be safer and cleaner to have cba launch an event when preInit finishes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks about as safe and clean as it gets - only depends on
directCall
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would've used
CBA_fnc_execNextFrame
, but theEachFrame
handler that does that is installed at postInit - many frames after preInit.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a long shot, but maybe some other mod could conceivably clog the scheduler during preinit, preventing this from running before postInit.