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

Modules Cleanup #4813

Merged
merged 2 commits into from
Jan 14, 2017
Merged

Modules Cleanup #4813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92fb9db
Cleanup
Neviothr Jan 11, 2017
cac8e9c
Added newlines
Neviothr Jan 11, 2017
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
2 changes: 0 additions & 2 deletions addons/modules/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));
Expand All @@ -11,7 +10,6 @@ class Extended_PreInit_EventHandlers {
};
};


class Extended_PostInit_EventHandlers {
class _ACE_modules { // using a _ so it is the first postInit to be executed
init = QUOTE(call COMPILE_FILE(XEH_postInit));
Expand Down
3 changes: 1 addition & 2 deletions addons/modules/XEH_PREP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

PREP(moduleInit);
PREP(moduleInit);
5 changes: 2 additions & 3 deletions addons/modules/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#include "script_component.hpp"

[QEGVAR(common,initSettingsFromModules), {
Expand All @@ -10,15 +9,15 @@
[_x] call {
params ["_logic"];
private _logicType = typeOf _logic;
_logic hideobject true;
_logic hideObject true;

if (_logic getVariable [QGVAR(initalized), false]) exitWith {};
private _config = (configFile >> "CfgVehicles" >> _logicType);
if !(isClass _config) exitWith {};

private _isGlobal = getNumber (_config >> "isGlobal") > 0;
private _isDisposable = getNumber (_config >> "isDisposable") > 0;
private _isPersistent = getNumber (_config >> "isPersistent") > 0 || getnumber (_config >> "isGlobal") > 1;
private _isPersistent = getNumber (_config >> "isPersistent") > 0 || getNumber (_config >> "isGlobal") > 1;
private _isSingular = getNumber (_config >> "isSingular") > 0;
private _function = getText (_config >> "function");
if (isNil _function) then {
Expand Down