Merge pull request #3768 from acemod/add-zeus-objects-setting

Add zeus objects setting
This commit is contained in:
SilentSpike
2016-05-13 10:39:20 +01:00
4 changed files with 14 additions and 2 deletions

View File

@ -31,9 +31,9 @@ class ACE_Settings {
values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(revealMines_partial), CSTRING(revealMines_full)}; values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(revealMines_partial), CSTRING(revealMines_full)};
}; };
class GVAR(autoAddObjects) { class GVAR(autoAddObjects) {
typeName = "BOOL";
value = 0;
displayName = CSTRING(AddObjectsToCurator); displayName = CSTRING(AddObjectsToCurator);
description = CSTRING(AddObjectsToCurator_desc); description = CSTRING(AddObjectsToCurator_desc);
value = 0;
typeName = "BOOL";
}; };
}; };

View File

@ -71,6 +71,12 @@ class CfgVehicles {
}; };
}; };
}; };
class autoAddObjects {
displayName = CSTRING(AddObjectsToCurator);
description = CSTRING(AddObjectsToCurator_desc);
typeName = "BOOL";
defaultValue = 0;
};
}; };
class ModuleDescription { class ModuleDescription {
description = CSTRING(Settings_Description); description = CSTRING(Settings_Description);

View File

@ -15,6 +15,11 @@
params ["_object"]; params ["_object"];
if !(EGVAR(common,settingsInitFinished)) exitWith {
TRACE_1("pushing to runAtSettingsInitialized", _this);
EGVAR(common,runAtSettingsInitialized) pushBack [FUNC(addObjectToCurator), _this];
};
if (!(_object getVariable [QGVAR(addObject), GVAR(autoAddObjects)])) exitWith {}; if (!(_object getVariable [QGVAR(addObject), GVAR(autoAddObjects)])) exitWith {};
[{ [{

View File

@ -24,3 +24,4 @@ if !(_activated) exitWith {};
[_logic, QGVAR(radioOrdnance), "radioOrdnance"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(radioOrdnance), "radioOrdnance"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(revealMines), "revealMines"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(revealMines), "revealMines"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(remoteWind), "remoteWind"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(remoteWind), "remoteWind"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(autoAddObjects), "autoAddObjects"] call EFUNC(common,readSettingFromModule);