diff --git a/addons/goggles/RscTitles.hpp b/addons/goggles/RscTitles.hpp index 6bb5364fe12..318da7ed439 100644 --- a/addons/goggles/RscTitles.hpp +++ b/addons/goggles/RscTitles.hpp @@ -5,8 +5,8 @@ class RscTitles { idd = -1; onLoad = "uiNamespace setVariable ['ACE_Goggles_Display', _this select 0]"; onUnload = "uiNamespace setVariable ['ACE_Goggles_Display', displayNull]"; - fadeIn=0.5; - fadeOut=0.5; + fadeIn = 0.5; + fadeOut = 0.5; movingEnable = 0; duration = 10e10; name = "RscACE_Goggles_BaseTitle"; @@ -14,11 +14,11 @@ class RscTitles { }; class RscACE_Goggles: RscACE_Goggles_BaseTitle { - idd = 1044; + idd = IDD_GOGGLES; name = "RscACE_Goggles"; class controls { class gogglesImage: RscPicture { - idc = 10650; + idc = IDC_GOGGLES_OVERLAY; x = "safeZoneX"; y = "safeZoneY"; w = "safeZoneW"; @@ -28,22 +28,22 @@ class RscTitles { }; class RscACE_GogglesEffects: RscACE_Goggles_BaseTitle { - idd = 1045; + idd = IDD_GOGGLESEFFECTS; onLoad = "uiNamespace setVariable ['ACE_Goggles_DisplayEffects', _this select 0]"; onUnload = "uiNamespace setVariable ['ACE_Goggles_DisplayEffects', displayNull]"; name = "RscACE_GogglesEffects"; - fadeIn=0; - fadeOut=0.5; + fadeIn = 0; + fadeOut = 0.5; class controls { class dirtImage: RscPicture { - idc = 10660; + idc = IDC_GOGGLESEFFECTS_DIRT; x = "safeZoneX"; y = "safeZoneY"; w = "safeZoneW"; h = "safeZoneH"; }; class dustImage: RscPicture { - idc = 10662; + idc = IDC_GOGGLESEFFECTS_DUST; x = "safeZoneX"; y = "safeZoneY"; w = "safeZoneW"; diff --git a/addons/goggles/functions/fnc_applyDirtEffect.sqf b/addons/goggles/functions/fnc_applyDirtEffect.sqf index a246f1293fc..aa4de7a298a 100644 --- a/addons/goggles/functions/fnc_applyDirtEffect.sqf +++ b/addons/goggles/functions/fnc_applyDirtEffect.sqf @@ -29,10 +29,10 @@ if ([_unit] call FUNC(isGogglesVisible)) then { if (_dirtImage != "") then { GVAR(GogglesEffectsLayer) cutRsc ["RscACE_GogglesEffects", "PLAIN", 0.1, false, false]; - (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10660) ctrlSetText _dirtImage; + (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl IDC_GOGGLESEFFECTS_DIRT) ctrlSetText _dirtImage; private _effectBrightness = linearConversion [0,1,([] call EFUNC(common,ambientBrightness)),0.25,1]; - (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10660) ctrlSetTextColor [_effectBrightness, _effectBrightness, _effectBrightness, 1]; + (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl IDC_GOGGLESEFFECTS_DIRT) ctrlSetTextColor [_effectBrightness, _effectBrightness, _effectBrightness, 1]; [QGVAR(effect), [_unit, "dirt"]] call CBA_fnc_localEvent; TRACE_1("dirt",_effectBrightness); }; diff --git a/addons/goggles/functions/fnc_applyDustEffect.sqf b/addons/goggles/functions/fnc_applyDustEffect.sqf index c00754c4eaa..23ebbb2d0e5 100644 --- a/addons/goggles/functions/fnc_applyDustEffect.sqf +++ b/addons/goggles/functions/fnc_applyDustEffect.sqf @@ -22,10 +22,10 @@ private _unit = ACE_player; if ([_unit] call FUNC(isGogglesVisible)) exitWith { GVAR(GogglesEffectsLayer) cutRsc ["RscACE_GogglesEffects", "PLAIN", 2, false, false]; - ((GETUVAR(GVAR(DisplayEffects),displayNull)) displayCtrl 10662) ctrlSetText format [getText (configFile >> "CfgGlasses" >> goggles _unit >> "ACE_DustPath"), GETDUSTT(DAMOUNT) + 1]; + ((GETUVAR(GVAR(DisplayEffects),displayNull)) displayCtrl IDC_GOGGLESEFFECTS_DUST) ctrlSetText format [getText (configFile >> "CfgGlasses" >> goggles _unit >> "ACE_DustPath"), GETDUSTT(DAMOUNT) + 1]; private _effectBrightness = linearConversion [0,1,([] call EFUNC(common,ambientBrightness)),0.25,1]; - ((GETUVAR(GVAR(DisplayEffects),displayNull)) displayCtrl 10662) ctrlSetTextColor [_effectBrightness, _effectBrightness, _effectBrightness, 1]; + ((GETUVAR(GVAR(DisplayEffects),displayNull)) displayCtrl IDC_GOGGLESEFFECTS_DUST) ctrlSetTextColor [_effectBrightness, _effectBrightness, _effectBrightness, 1]; TRACE_1("dust",_effectBrightness); SETDUST(DAMOUNT,CLAMP(GETDUSTT(DAMOUNT) + 1,0,1)); diff --git a/addons/goggles/functions/fnc_applyGlassesEffect.sqf b/addons/goggles/functions/fnc_applyGlassesEffect.sqf index 9df47ec4d2a..23c22352218 100644 --- a/addons/goggles/functions/fnc_applyGlassesEffect.sqf +++ b/addons/goggles/functions/fnc_applyGlassesEffect.sqf @@ -48,7 +48,7 @@ private _angle = getNumber (_config >> "ACE_Overlay_Angle"); if (_imagePath != "") then { GVAR(GogglesLayer) cutRsc ["RscACE_Goggles", "PLAIN", 1, false, false]; - private _overlay = (GLASSDISPLAY displayCtrl 10650); + private _overlay = (GLASSDISPLAY displayCtrl IDC_GOGGLES_OVERLAY); _overlay ctrlSetText _imagePath; if ((_angle != 0) && {((ctrlAngle _overlay) # 0) != _angle}) then { diff --git a/addons/goggles/functions/fnc_handleExplosion.sqf b/addons/goggles/functions/fnc_handleExplosion.sqf index 8b6027cb363..b7340a44cb1 100644 --- a/addons/goggles/functions/fnc_handleExplosion.sqf +++ b/addons/goggles/functions/fnc_handleExplosion.sqf @@ -44,7 +44,7 @@ if (getText (_config >> "ACE_OverlayCracked") != "") then { GVAR(GogglesLayer) cutRsc ["RscACE_Goggles", "PLAIN", 1, false, false]; }; - (GLASSDISPLAY displayCtrl 10650) ctrlSetText getText (_config >> "ACE_OverlayCracked"); + (GLASSDISPLAY displayCtrl IDC_GOGGLES_OVERLAY) ctrlSetText getText (_config >> "ACE_OverlayCracked"); }; ["ace_glassesCracked", [_unit]] call CBA_fnc_localEvent; diff --git a/addons/goggles/functions/fnc_removeDirtEffect.sqf b/addons/goggles/functions/fnc_removeDirtEffect.sqf index eff8e102ab2..d8718e4a64b 100644 --- a/addons/goggles/functions/fnc_removeDirtEffect.sqf +++ b/addons/goggles/functions/fnc_removeDirtEffect.sqf @@ -16,5 +16,5 @@ */ if (!isNull (GETUVAR(GVAR(DisplayEffects),displayNull))) then { - (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10660) ctrlSetText ""; + (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl IDC_GOGGLESEFFECTS_DIRT) ctrlSetText ""; }; diff --git a/addons/goggles/functions/fnc_removeDustEffect.sqf b/addons/goggles/functions/fnc_removeDustEffect.sqf index 8d424662d9c..6903fd5fc23 100644 --- a/addons/goggles/functions/fnc_removeDustEffect.sqf +++ b/addons/goggles/functions/fnc_removeDustEffect.sqf @@ -16,5 +16,5 @@ */ if (!isNull (GETUVAR(GVAR(DisplayEffects),displayNull))) then { - (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10662) ctrlSetText ""; + (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl IDC_GOGGLESEFFECTS_DUST) ctrlSetText ""; }; diff --git a/addons/goggles/script_macros.hpp b/addons/goggles/script_macros.hpp index 1fccb9114bf..17a61e72699 100644 --- a/addons/goggles/script_macros.hpp +++ b/addons/goggles/script_macros.hpp @@ -27,3 +27,10 @@ #define GLASSDISPLAY GETUVAR(GVAR(Display),displayNull) #define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}}) + +#define IDD_GOGGLES 1044 +#define IDC_GOGGLES_OVERLAY 10650 + +#define IDD_GOGGLESEFFECTS 1045 +#define IDC_GOGGLESEFFECTS_DIRT 10660 +#define IDC_GOGGLESEFFECTS_DUST 10662