From 8ad6d3ccff6932235b2ab3b868d6151dc28baf2c Mon Sep 17 00:00:00 2001 From: Whigital Date: Fri, 22 Nov 2019 20:14:26 +0100 Subject: [PATCH 1/2] Update hardcoded layer id --- addons/kestrel4500/functions/fnc_createKestrelDialog.sqf | 2 +- addons/kestrel4500/functions/fnc_displayKestrel.sqf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf index 445c6cc789..96cf15e00d 100644 --- a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf +++ b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf @@ -20,7 +20,7 @@ if (underwater ACE_player) exitWith { false }; if (!("ACE_Kestrel4500" in (uniformItems ACE_player)) && !("ACE_Kestrel4500" in (vestItems ACE_player))) exitWith { false }; GVAR(Overlay) = false; -3 cutText ["", "PLAIN"]; +(QGVAR(Layer) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; GVAR(Kestrel4500) = true; createDialog 'Kestrel4500_Display'; diff --git a/addons/kestrel4500/functions/fnc_displayKestrel.sqf b/addons/kestrel4500/functions/fnc_displayKestrel.sqf index c93de715ed..c6f6d55d3e 100644 --- a/addons/kestrel4500/functions/fnc_displayKestrel.sqf +++ b/addons/kestrel4500/functions/fnc_displayKestrel.sqf @@ -38,7 +38,7 @@ if (GVAR(Overlay)) exitWith { GVAR(Overlay) = false; - 3 cutText ["", "PLAIN"]; + (QGVAR(Layer) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; true }; if (underwater ACE_player) exitWith { true }; @@ -55,7 +55,7 @@ GVAR(Overlay) = true; // abort condition if (!GVAR(Overlay) || {!(("ACE_Kestrel4500" in (uniformItems ACE_player)) || ("ACE_Kestrel4500" in (vestItems ACE_player)))}) exitWith { GVAR(Overlay) = false; - 3 cutText ["", "PLAIN"]; + (QGVAR(Layer) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; [_this select 1] call CBA_fnc_removePerFrameHandler; }; @@ -64,7 +64,7 @@ GVAR(Overlay) = true; private _outputData = [] call FUNC(generateOutputData); - 3 cutRsc ["RscKestrel4500", "PLAIN", 1, false]; + (QGVAR(Layer) call BIS_fnc_rscLayer) cutRsc ["RscKestrel4500", "PLAIN", 1, false]; _outputData params [ "_ctrlTop", "_ctrlCenterBig", From 772a0fcd6ae689a9c9f1bd00dc457cbca9b900a0 Mon Sep 17 00:00:00 2001 From: Whigital Date: Fri, 22 Nov 2019 21:47:51 +0100 Subject: [PATCH 2/2] Alt. syntax in favor of obsolete BIS func. --- addons/kestrel4500/functions/fnc_createKestrelDialog.sqf | 2 +- addons/kestrel4500/functions/fnc_displayKestrel.sqf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf index 96cf15e00d..aafa2928f7 100644 --- a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf +++ b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf @@ -20,7 +20,7 @@ if (underwater ACE_player) exitWith { false }; if (!("ACE_Kestrel4500" in (uniformItems ACE_player)) && !("ACE_Kestrel4500" in (vestItems ACE_player))) exitWith { false }; GVAR(Overlay) = false; -(QGVAR(Layer) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; +QGVAR(Layer) cutText ["", "PLAIN"]; GVAR(Kestrel4500) = true; createDialog 'Kestrel4500_Display'; diff --git a/addons/kestrel4500/functions/fnc_displayKestrel.sqf b/addons/kestrel4500/functions/fnc_displayKestrel.sqf index c6f6d55d3e..143ed1cc27 100644 --- a/addons/kestrel4500/functions/fnc_displayKestrel.sqf +++ b/addons/kestrel4500/functions/fnc_displayKestrel.sqf @@ -38,7 +38,7 @@ if (GVAR(Overlay)) exitWith { GVAR(Overlay) = false; - (QGVAR(Layer) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; + QGVAR(Layer) cutText ["", "PLAIN"]; true }; if (underwater ACE_player) exitWith { true }; @@ -55,7 +55,7 @@ GVAR(Overlay) = true; // abort condition if (!GVAR(Overlay) || {!(("ACE_Kestrel4500" in (uniformItems ACE_player)) || ("ACE_Kestrel4500" in (vestItems ACE_player)))}) exitWith { GVAR(Overlay) = false; - (QGVAR(Layer) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; + QGVAR(Layer) cutText ["", "PLAIN"]; [_this select 1] call CBA_fnc_removePerFrameHandler; }; @@ -64,7 +64,7 @@ GVAR(Overlay) = true; private _outputData = [] call FUNC(generateOutputData); - (QGVAR(Layer) call BIS_fnc_rscLayer) cutRsc ["RscKestrel4500", "PLAIN", 1, false]; + QGVAR(Layer) cutRsc ["RscKestrel4500", "PLAIN", 1, false]; _outputData params [ "_ctrlTop", "_ctrlCenterBig",