From eed6ff792f15555e0bc4e916a43b8be4fd5bd8cd Mon Sep 17 00:00:00 2001
From: Filip Maciejewski <veteran29@users.noreply.github.com>
Date: Tue, 3 Sep 2024 03:39:49 +0200
Subject: [PATCH] Fix safeZone commands casing

---
 addons/back_to_game/teleportDialog.hpp | 32 +++++++++++++-------------
 addons/loading/XEH_loadingDisplay.sqf  |  4 ++--
 addons/loading/gui.hpp                 |  8 +++----
 addons/main_menu/RscDisplayClient.hpp  |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/back_to_game/teleportDialog.hpp b/addons/back_to_game/teleportDialog.hpp
index 8993533b..c58cb072 100644
--- a/addons/back_to_game/teleportDialog.hpp
+++ b/addons/back_to_game/teleportDialog.hpp
@@ -9,35 +9,35 @@ class GVAR(teleportDialog) {
     class controls {
         class RscFrame_1058: RscFrame {
             idc = 1800;
-            x = "0.402031 * safezoneW + safezoneX";
-            y = "0.357 * safezoneH + safezoneY";
-            w = "0.195937 * safezoneW";
-            h = "0.165 * safezoneH";
+            x = "0.402031 * safeZoneW + safeZoneX";
+            y = "0.357 * safeZoneH + safeZoneY";
+            w = "0.195937 * safeZoneW";
+            h = "0.165 * safeZoneH";
         };
         class TeleportText: RscText {
             idc = 1000;
             text = CSTRING(TeleportAsk);
-            x = "0.412344 * safezoneW + safezoneX";
-            y = "0.368 * safezoneH + safezoneY";
-            w = "0.180469 * safezoneW";
-            h = "0.055 * safezoneH";
+            x = "0.412344 * safeZoneW + safeZoneX";
+            y = "0.368 * safeZoneH + safeZoneY";
+            w = "0.180469 * safeZoneW";
+            h = "0.055 * safeZoneH";
         };
         class AgreeButton: RscButton {
             idc = 1600;
             text = CSTRING(TeleportAgree);
-            x = "0.407187 * safezoneW + safezoneX";
-            y = "0.445 * safezoneH + safezoneY";
-            w = "0.0670312 * safezoneW";
-            h = "0.066 * safezoneH";
+            x = "0.407187 * safeZoneW + safeZoneX";
+            y = "0.445 * safeZoneH + safeZoneY";
+            w = "0.0670312 * safeZoneW";
+            h = "0.066 * safeZoneH";
             action = QUOTE(call FUNC(dialogConfirm); closeDialog 0);
         };
         class RejectButton: RscButton {
             idc = 1601;
             text = CSTRING(TeleportReject);
-            x = "0.525781 * safezoneW + safezoneX";
-            y = "0.445 * safezoneH + safezoneY";
-            w = "0.0670312 * safezoneW";
-            h = "0.066 * safezoneH";
+            x = "0.525781 * safeZoneW + safeZoneX";
+            y = "0.445 * safeZoneH + safeZoneY";
+            w = "0.0670312 * safeZoneW";
+            h = "0.066 * safeZoneH";
             action = QUOTE(call FUNC(dialogReject); closeDialog 0);
         };
     };
diff --git a/addons/loading/XEH_loadingDisplay.sqf b/addons/loading/XEH_loadingDisplay.sqf
index e6d03ab5..f31df1d2 100644
--- a/addons/loading/XEH_loadingDisplay.sqf
+++ b/addons/loading/XEH_loadingDisplay.sqf
@@ -22,8 +22,8 @@ private _height = 256 * pixelH;
 
 private _picture = _display ctrlCreate ["RscPicture", -1];
 _picture ctrlSetPosition [
-    safezoneX,
-    safezoneY + safeZoneH - _height,
+    safeZoneX,
+    safeZoneY + safeZoneH - _height,
     _width, _height
 ];
 
diff --git a/addons/loading/gui.hpp b/addons/loading/gui.hpp
index 559f1f76..6fb4f19e 100644
--- a/addons/loading/gui.hpp
+++ b/addons/loading/gui.hpp
@@ -17,9 +17,9 @@ class RscPictureKeepAspect;
                     class GVAR(background): RscPictureKeepAspect { \
                         idc = IDC_LOADINGSTART_CUSTOM_BG; \
                         x = 0; \
-                        y = "-(0.5 * safezoneH)"; \
-                        w = "safezoneW"; \
-                        h = "2 * safezoneH"; \
+                        y = "-(0.5 * safeZoneH)"; \
+                        w = "safeZoneW"; \
+                        h = "2 * safeZoneH"; \
                     }; \
                     class Noise; \
                     class GVAR(lines): Noise {}; \
@@ -28,7 +28,7 @@ class RscPictureKeepAspect;
                     }; \
                     class GVAR(logo): Logo { \
                         idc = -1; \
-                        y = "0 * safezoneH"; \
+                        y = "0 * safeZoneH"; \
                     }; \
                 }; \
             }; \
diff --git a/addons/main_menu/RscDisplayClient.hpp b/addons/main_menu/RscDisplayClient.hpp
index 49deffff..57a60ae3 100644
--- a/addons/main_menu/RscDisplayClient.hpp
+++ b/addons/main_menu/RscDisplayClient.hpp
@@ -4,7 +4,7 @@ class RscDisplayClient: RscStandardDisplay {
         class GVAR(serverStatus): RscControlsGroupNoScrollbars {
             onLoad = QUOTE(with uiNamespace do {call FUNC(serverStatusOnLoad)});
 
-                x = QUOTE(safezoneX + POS_W(1));
+                x = QUOTE(safeZoneX + POS_W(1));
                 y = QUOTE(safeZoneY + 3.5 * POS_H(1));
                 w = QUOTE(POS_W(SERVER_STATUS_W));
                 h = QUOTE(POS_H(SERVER_STATUS_H));