Skip to content
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.

Sign up for GitHub

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

Jump to bottom

add optional pbo to load settings from userconfig file #450

Merged
merged 4 commits into from
Aug 6, 2016
Merged

add optional pbo to load settings from userconfig file #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5da218
add optional pbo to load settings from userconfig file
commy2 Jul 31, 2016
a28ff0c
improve logging in case file is not present
commy2 Jul 31, 2016
391895e
fix undefined function calls
commy2 Aug 6, 2016
b21acec
Merge remote-tracking branch 'origin/master' into optional-file-to-lo…
commy2 Aug 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion addons/settings/fnc_import.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ _info = _info call FUNC(parse);
SET_TEMP_NAMESPACE_FORCED(_setting,_force,_source);
} forEach _info;

call FUNC(gui_refresh);
if (!isNull (uiNamespace getVariable [QGVAR(display), displayNull])) then {
call FUNC(gui_refresh);
};
1 change: 1 addition & 0 deletions optionals/auto_load_settings_file/$PBOPREFIX$
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x\cba\addons\auto_load_settings_file
6 changes: 6 additions & 0 deletions optionals/auto_load_settings_file/CfgEventHandlers.hpp
View file
Open in desktop
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));
};
};
12 changes: 12 additions & 0 deletions optionals/auto_load_settings_file/XEH_preInit.sqf
View file
Open in desktop
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 {
Copy link
Contributor

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

Copy link
Contributor

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.

Copy link
Contributor Author

@commy2 commy2 Aug 1, 2016 •
edited
Loading

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 the EachFrame handler that does that is installed at postInit - many frames after preInit.

Copy link
Contributor

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.

{
#include "loadSettingsFile.sqf"
} call CBA_fnc_directCall;
};

ADDON = true;
17 changes: 17 additions & 0 deletions optionals/auto_load_settings_file/config.cpp
View file
Open in desktop
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"
14 changes: 14 additions & 0 deletions optionals/auto_load_settings_file/loadSettingsFile.sqf
View file
Open in desktop
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 EFUNC(settings,import);
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.";
};
16 changes: 16 additions & 0 deletions optionals/auto_load_settings_file/script_component.hpp
View file
Open in desktop
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"