Skip to content

Commit

Permalink
Fix safeZone commands casing
Browse files Browse the repository at this point in the history
  • Loading branch information
veteran29 committed Sep 3, 2024
1 parent 1d6c9ce commit eed6ff7
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
32 changes: 16 additions & 16 deletions addons/back_to_game/teleportDialog.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/loading/XEH_loadingDisplay.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
];

Expand Down
8 changes: 4 additions & 4 deletions addons/loading/gui.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}; \
Expand All @@ -28,7 +28,7 @@ class RscPictureKeepAspect;
}; \
class GVAR(logo): Logo { \
idc = -1; \
y = "0 * safezoneH"; \
y = "0 * safeZoneH"; \
}; \
}; \
}; \
Expand Down
2 changes: 1 addition & 1 deletion addons/main_menu/RscDisplayClient.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit eed6ff7

Please sign in to comment.