Merge pull request #1396 from acemod/atragDayNightGUI

Nighttime GUI for the ATragMX.
acemod · May 26, 2015 · bfd31b2 · bfd31b2
2 parents 3a810ab + dc1bfa9
commit bfd31b2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp
@@ -152,15 +152,15 @@ class ATragMX_Display {
             type=0;
             font="TahomaB";
             SizeEX=0.025;
-            idc=-1;
+            idc=720000;
             style=48;
             x=0.55*safezoneW+safezoneX-0.256;
             y=0.265*safezoneH+safezoneY-0.1;
             w=1.024;
             h=1.024*4/3;
             colorBackground[]={1,1,1,1};
             colorText[]={1,1,1,1};
-            text=PATHTOF(UI\atrag.paa);
+            text=PATHTOF(UI\atrag_d.paa);
         };
         class POWER: ATragMX_RscButton {
             idc=-1;

diff --git a/addons/atragmx/UI/ATRAG.paa → addons/atragmx/UI/ATRAG_D.paa b/addons/atragmx/UI/ATRAG.paa → addons/atragmx/UI/ATRAG_D.paa
diff --git a/addons/atragmx/UI/ATRAG_N.paa b/addons/atragmx/UI/ATRAG_N.paa
diff --git a/addons/atragmx/functions/fnc_create_dialog.sqf b/addons/atragmx/functions/fnc_create_dialog.sqf
@@ -15,6 +15,9 @@
  */
 #include "script_component.hpp"
 
+#define __dsp (uiNamespace getVariable "ATragMX_Display")
+#define __ctrlBackground (__dsp displayCtrl 720000)
+
 if (GVAR(active)) exitWith { false };
 if (underwater ACE_player) exitWith { false };
 if (!("ACE_ATragMX" in (uniformItems ACE_player)) && !("ACE_ATragMX" in (vestItems ACE_player))) exitWith { false };
@@ -49,4 +52,11 @@ GVAR(showTargetSpeedAssistTimer) call FUNC(show_target_speed_assist_timer);
 
 GVAR(active) = true;
 
+GVAR(DialogPFH) = [{
+    if (!GVAR(active)) exitWith {
+        [_this select 1] call cba_fnc_removePerFrameHandler;
+    };
+    __ctrlBackground ctrlSetText format [QUOTE(PATHTOF(UI\ATRAG_%1.paa)), ["N", "D"] select (call EFUNC(common,ambientBrightness))];
+}, 60, []] call cba_fnc_addPerFrameHandler;
+
 true
diff --git a/addons/atragmx/functions/fnc_on_close_dialog.sqf b/addons/atragmx/functions/fnc_on_close_dialog.sqf
@@ -1,4 +1,5 @@
 #include "script_component.hpp"
 
 uiNamespace setVariable ['ATragMX_Display', nil];
-GVAR(active) = false;
+GVAR(active) = false;
+[GVAR(DialogPFH)] call removePerFrameHandler;