Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Field Rations - Fix GUI Layout not using XGVAR (#8646)

Browse Source 
Fix #8644
This commit is contained in:
PabstMirror 2021-10-28 16:24:45 -05:00 committed by GitHub
parent 06336b8dcf
commit 0ddb7185c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/field_rations/RscTitles.hpp
View File

@ -12,15 +12,15 @@ class RscTitles {
class controls {
class Thirst: RscPicture {
idc = IDC_COLORED_HUD_THIRST;
x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
w = 2 * GUI_GRID_W;
h = 2 * GUI_GRID_H;
text = QPATHTOF(ui\icon_hud_thirststatus.paa);
};
class Hunger: Thirst {
idc = IDC_COLORED_HUD_HUNGER;
x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
text = QPATHTOF(ui\icon_hud_hungerstatus.paa);
};
};
@ -35,23 +35,23 @@ class RscTitles {
class controlsBackground {
class Thirst: RscPicture {
idc = -1;
x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
w = 2 * GUI_GRID_W;
h = 2 * GUI_GRID_H;
text = QPATHTOF(ui\icon_hud_thirststatus.paa);
colorText[] = {1, 1, 1, 0.2};
};
class Hunger: Thirst {
x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
text = QPATHTOF(ui\icon_hud_hungerstatus.paa);
};
};
class controls {
class ThirstGroup: RscControlsGroupNoScrollbars {
idc = IDC_DRAINING_HUD_THIRST_GROUP;
x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
w = 2 * GUI_GRID_W;
h = 2 * GUI_GRID_H;
class controls {
@ -67,7 +67,7 @@ class RscTitles {
};
class HungerGroup: ThirstGroup {
idc = IDC_DRAINING_HUD_HUNGER_GROUP;
x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
class controls: controls {
class Icon: Icon {
idc = IDC_DRAINING_HUD_HUNGER_ICON;

2
addons/field_rations/functions/fnc_handleHUD.sqf
View File

@ -55,7 +55,7 @@ if (XGVAR(hudType) == 0) then {
];
} else {
// Reposition controls group and icon to create draining effect
private _defaultY = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
private _defaultY = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
{
_x params ["_status", "_groupIDC", "_iconIDC"];