From 618d557227378004afe095562ce592ee02dd8221 Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 7 Jun 2015 13:55:35 +0200 Subject: [PATCH] Layer IDs are now stored in #defines --- addons/huntir/functions/fnc_cam.sqf | 2 +- addons/huntir/functions/fnc_huntir.sqf | 8 ++++---- addons/huntir/functions/fnc_huntirCompass.sqf | 4 ++-- addons/huntir/script_component.hpp | 3 +++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/huntir/functions/fnc_cam.sqf b/addons/huntir/functions/fnc_cam.sqf index b934a86c0b..234d083282 100644 --- a/addons/huntir/functions/fnc_cam.sqf +++ b/addons/huntir/functions/fnc_cam.sqf @@ -25,7 +25,7 @@ GVAR(cur_cam) = 0; GVAR(ROTATE) = 0; GVAR(ELEVAT) = 0.01; -13521 cutText["","PLAIN"]; +HUNTIR_BACKGROUND_LAYER_ID cutText["","PLAIN"]; closedialog 0; createDialog "ace_huntir_cam_dialog"; diff --git a/addons/huntir/functions/fnc_huntir.sqf b/addons/huntir/functions/fnc_huntir.sqf index 510316d06d..7f02191bab 100644 --- a/addons/huntir/functions/fnc_huntir.sqf +++ b/addons/huntir/functions/fnc_huntir.sqf @@ -19,12 +19,12 @@ if ((ACE_player call CBA_fnc_getUnitAnim) select 0 == "stand") then { ACE_player playMove "AmovPercMstpSrasWrflDnon_diary"; }; -13521 cutText ["", "BLACK", 0]; +HUNTIR_BACKGROUND_LAYER_ID cutText ["", "BLACK", 0]; createDialog "ace_huntir_cam_dialog_off"; [{ if (!dialog) exitWith { - 13521 cutText ["", "PLAIN", 0]; + HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN", 0]; }; closeDialog 0; createDialog "ace_huntir_cam_dialog_inactive"; @@ -48,7 +48,7 @@ createDialog "ace_huntir_cam_dialog_off"; if (dialog && GVAR(state) == "connected") then { [_nearestHuntIRs select 0] call FUNC(cam); } else { - 13521 cutText ["", "PLAIN"]; + HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN"]; }; }; switch (GVAR(state)) do { @@ -84,7 +84,7 @@ createDialog "ace_huntir_cam_dialog_off"; [{ GVAR(done) = true; closedialog 0; - 13521 cutText ["", "PLAIN"]; + HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN"]; }, [], 3, 0] call EFUNC(common,waitAndExecute); }; }; diff --git a/addons/huntir/functions/fnc_huntirCompass.sqf b/addons/huntir/functions/fnc_huntirCompass.sqf index 8a726c720c..30fcf45900 100644 --- a/addons/huntir/functions/fnc_huntirCompass.sqf +++ b/addons/huntir/functions/fnc_huntirCompass.sqf @@ -48,13 +48,13 @@ _fnc_correctIt = { _pos }; -1234 cutRsc ["ace_huntir_cam_rose", "PLAIN"]; +HUNTIR_CAM_ROSE_LAYER_ID cutRsc ["ace_huntir_cam_rose", "PLAIN"]; [{ EXPLODE_1_PVT(_this select 0,_fnc_correctIt); if (GVAR(stop)) exitWith { - 1234 cutText ["", "PLAIN"]; + HUNTIR_CAM_ROSE_LAYER_ID cutText ["", "PLAIN"]; [_this select 1] call CBA_fnc_removePerFrameHandler; }; diff --git a/addons/huntir/script_component.hpp b/addons/huntir/script_component.hpp index 2697cf0098..262cd3a08c 100644 --- a/addons/huntir/script_component.hpp +++ b/addons/huntir/script_component.hpp @@ -10,3 +10,6 @@ #endif #include "\z\ace\addons\main\script_macros.hpp" + +#define HUNTIR_BACKGROUND_LAYER_ID 13521 +#define HUNTIR_CAM_ROSE_LAYER_ID 13522 \ No newline at end of file