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.

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

Change ace_map settings to use CBA init directly #5984

Merged
merged 6 commits into from
Jan 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ Luigi "Luigium" Myrini <luigium@outlook.fr>
Macusercom <macusercom@gmail.com>
MarcBook
meat <p.humberdroz@gmail.com>
mharis001 <mhariszakar@gmail.com>
Michail Nikolaev
MikeMatrix <m.braun92@gmail.com>
nic547 <nic547@outlook.com>
Expand Down
62 changes: 10 additions & 52 deletions addons/map/ACE_Settings.hpp
Original file line number Diff line number Diff line change
@@ -1,74 +1,32 @@
class ACE_Settings {
class GVAR(BFT_Interval) {
category = CSTRING(Module_DisplayName);
value = 1.0;
typeName = "SCALAR";
displayName = CSTRING(BFT_Interval_DisplayName);
description = CSTRING(BFT_Interval_Description);
sliderSettings[] = {0, 30, 1, 1};
movedToSQF = 1;
};
class GVAR(BFT_Enabled) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(BFT_Enabled_DisplayName);
description = CSTRING(BFT_Enabled_Description);
movedToSQF = 1;
};
class GVAR(BFT_HideAiGroups) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(BFT_HideAiGroups_DisplayName);
description = CSTRING(BFT_HideAiGroups_Description);
movedToSQF = 1;
};
class GVAR(BFT_ShowPlayerNames) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(BFT_ShowPlayerNames_DisplayName);
description = CSTRING(BFT_ShowPlayerNames_Description);
movedToSQF = 1;
};
class GVAR(mapIllumination) {
category = CSTRING(Module_DisplayName);
value = 1;
typeName = "BOOL";
displayName = CSTRING(MapIllumination_DisplayName);
description = CSTRING(MapIllumination_Description);
movedToSQF = 1;
};
class GVAR(mapGlow) {
category = CSTRING(Module_DisplayName);
value = 1;
typeName = "BOOL";
displayName = CSTRING(MapGlow_DisplayName);
description = CSTRING(MapGlow_Description);
movedToSQF = 1;
};
class GVAR(mapShake) {
category = CSTRING(Module_DisplayName);
value = 1;
typeName = "BOOL";
displayName = CSTRING(MapShake_DisplayName);
description = CSTRING(MapShake_Description);
movedToSQF = 1;
};
class GVAR(mapLimitZoom) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(MapLimitZoom_DisplayName);
description = CSTRING(MapLimitZoom_Description);
movedToSQF = 1;
};
class GVAR(mapShowCursorCoordinates) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(MapShowCursorCoordinates_DisplayName);
description = CSTRING(MapShowCursorCoordinates_Description);
movedToSQF = 1;
};
class GVAR(defaultChannel) {
category = CSTRING(Module_DisplayName);
value = -1;
typeName = "SCALAR";
displayName = CSTRING(DefaultChannel_DisplayName);
description = CSTRING(DefaultChannel_Description);
sliderSettings[] = {-1, 5, -1, -1};
movedToSQF = 1;
};
};
2 changes: 2 additions & 0 deletions addons/map/XEH_preInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;

#include "initSettings.sqf"

ADDON = true;
90 changes: 90 additions & 0 deletions addons/map/initSettings.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
[
QGVAR(mapIllumination),
"CHECKBOX",
[localize LSTRING(MapIllumination_DisplayName), localize LSTRING(MapIllumination_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
true,
true
] call CBA_settings_fnc_init;

[
QGVAR(mapGlow),
"CHECKBOX",
[localize LSTRING(MapGlow_DisplayName), localize LSTRING(MapGlow_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
true,
true
] call CBA_settings_fnc_init;

[
QGVAR(mapShake),
"CHECKBOX",
[localize LSTRING(MapShake_DisplayName), localize LSTRING(MapShake_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
true,
true
] call CBA_settings_fnc_init;

[
QGVAR(mapLimitZoom),
"CHECKBOX",
[localize LSTRING(MapLimitZoom_DisplayName), localize LSTRING(MapLimitZoom_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;

[
QGVAR(mapShowCursorCoordinates),
"CHECKBOX",
[localize LSTRING(MapShowCursorCoordinates_DisplayName), localize LSTRING(MapShowCursorCoordinates_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;

[
QGVAR(DefaultChannel),
"LIST",
[localize LSTRING(DefaultChannel_DisplayName), localize LSTRING(DefaultChannel_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
[[-1, 0, 1, 2, 3, 4, 5], [ELSTRING(common,Disabled), "STR_channel_global", "STR_channel_side", "STR_channel_command", "STR_channel_group", "STR_channel_vehicle", "STR_channel_direct"], 0],
true
] call CBA_settings_fnc_init;

// Blue Force Tracking
[
QGVAR(BFT_Enabled),
"CHECKBOX",
[localize LSTRING(BFT_Enabled_DisplayName), localize LSTRING(BFT_Enabled_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;

[
QGVAR(BFT_Interval),
"SLIDER",
[localize LSTRING(BFT_Interval_DisplayName), localize LSTRING(BFT_Interval_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
[0, 30, 1, 1],
true
] call CBA_settings_fnc_init;

[
QGVAR(BFT_ShowPlayerNames),
"CHECKBOX",
[localize LSTRING(BFT_ShowPlayerNames_DisplayName), localize LSTRING(BFT_ShowPlayerNames_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;

[
QGVAR(BFT_HideAiGroups),
"CHECKBOX",
[localize LSTRING(BFT_HideAiGroups_DisplayName), localize LSTRING(BFT_HideAiGroups_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;
Loading