#1957 - Fix BFT Module / Settings (for 3.2.1)

This commit is contained in:
PabstMirror 2015-08-01 00:01:33 -05:00
parent b449e4cab8
commit 2d051188a7
3 changed files with 6 additions and 9 deletions

View File

@ -39,14 +39,13 @@ class CfgVehicles {
}; };
}; };
class Module_F; class ACE_ModuleBlueForceTracking: ACE_Module {
class ACE_ModuleBlueForceTracking: Module_F {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
category = "ACE"; category = "ACE";
displayName = CSTRING(BFT_Module_DisplayName); displayName = CSTRING(BFT_Module_DisplayName);
function = QFUNC(blueForceTrackingModule); function = QFUNC(blueForceTrackingModule);
scope = 2; scope = 2;
isGlobal = 1; isGlobal = 0;
icon = PATHTOF(UI\Icon_Module_BFTracking_ca.paa); icon = PATHTOF(UI\Icon_Module_BFTracking_ca.paa);
class Arguments { class Arguments {
class Enabled { class Enabled {

View File

@ -47,6 +47,7 @@ call FUNC(determineZoom);
["SettingsInitialized", { ["SettingsInitialized", {
// Start Blue Force Tracking if Enabled // Start Blue Force Tracking if Enabled
if (GVAR(BFT_Enabled)) then { if (GVAR(BFT_Enabled)) then {
diag_log text "[ACE] Blue Force Tracking Enabled (client)";
GVAR(BFT_markers) = []; GVAR(BFT_markers) = [];
[FUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler; [FUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler;
}; };

View File

@ -12,15 +12,12 @@
#include "script_component.hpp" #include "script_component.hpp"
if !(hasInterface) exitWith {}; if (!isServer) exitWith {};
PARAMS_3(_logic,_units,_activated); PARAMS_1(_logic);
if !(_activated) exitWith {};
[_logic, QGVAR(BFT_Enabled), "Enabled"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(BFT_Enabled), "Enabled"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(BFT_Interval), "Interval"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(BFT_Interval), "Interval"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule);
diag_log text "[ACE]: Blue Force Tracking Module initialized."; diag_log text "[ACE]: Blue Force Tracking Module initialized. (server)";
TRACE_2("[ACE]: Blue Force Tracking Module initialized.", GVAR(BFT_Interval), GVAR(BFT_HideAiGroups));