Skip to content

Commit

Permalink
Tools - Fix configs for HEMTT v1.9.0 (#1609)
Browse files Browse the repository at this point in the history
  • Loading branch information
PabstMirror authored Sep 27, 2023
1 parent f147f06 commit ea5ebd4
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_arma2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class CBA_flexiMenu_rscArma2 {
};
//---------------------------------
class controls {
class caption: rscText {
class caption: RscText {
idc = _flexiMenu_IDC_menuDesc;
//x = QUOTE(_SX - _BW);
x = QUOTE(_leftButtonLevel1X);
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_buttonList.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class CBA_flexiMenu_rscButtonList { //: _flexiMenu_rscRose
};
//---------------------------------
class controls {
class caption: rscText {
class caption: RscText {
idc = _flexiMenu_IDC_menuDesc;
x = QUOTE(_SX - _BW);
y = QUOTE(_SY - _buttonsBeforeCenter * _BH - _gapH - _BH * _captionHgt);
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_iconRow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class CBA_flexiMenu_rscIconRow { //: _flexiMenu_rscRose
};
//---------------------------------
class controls {
class caption: rscText {
class caption: RscText {
idc = _flexiMenu_IDC_menuDesc;
x = QUOTE(_SX - _buttonsBeforeCenter * _BW);
y = QUOTE(_SY - _gapH-_StandardBH * _captionHgt);
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_popup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class CBA_flexiMenu_rscPopup { // _flexiMenu_rscRose
};
// ---------------------------------
class controls {
class caption: rscText {
class caption: RscText {
idc = _flexiMenu_IDC_menuDesc;
x = QUOTE(_SX - _BW);
y = QUOTE(safeZoneY + 0.30 * safeZoneH-_BH * _captionHgt);
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_rose.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class CBA_flexiMenu_rscRose {
};
//---------------------------------
class controls {
class caption: rscText {
class caption: RscText {
idc = _flexiMenu_IDC_menuDesc;
//x = QUOTE(_SX - _BW);
x = QUOTE(_leftButtonLevel1X);
Expand Down
8 changes: 5 additions & 3 deletions include/a3/ui_f/hpp/defineResincl.inc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// This file was modified from the original to remove 3 duplicate defines
// check for changes when updating includes
#ifndef _RESINCL_HPP
#define _RESINCL_HPP

Expand Down Expand Up @@ -1673,8 +1675,8 @@ enum
#define IDC_MULTI_FULL_FILTER 151
#define IDC_MULTI_TYPE_FILTER 152
#define IDC_MP_NEXT_SESSION 153
#define IDC_MULTI_BATTLEYE_FILTER 154
#define IDC_MULTI_EXPANSIONS_FILTER 155
// #define IDC_MULTI_BATTLEYE_FILTER 154
// #define IDC_MULTI_EXPANSIONS_FILTER 155
#define IDC_MULTI_FAVORITE_COLUMN 156
#define IDC_MULTI_FAVORITE_ICON 157
#define IDC_MULTI_SERVER_COUNT 158
Expand All @@ -1696,7 +1698,7 @@ enum
#define IDC_MP_QUICK_BEST_SERVER 112
#define IDC_MP_QUICK_FIND_SERVER 113
#define IDC_MP_QUICK_SHOW_SERVERS 114
#define IDC_MP_QUICK_SHOW_SERVERS 114
// #define IDC_MP_QUICK_SHOW_SERVERS 114
#define IDC_MP_QUICK_MODE_TITLE 115
#define IDC_MP_QUICK_MODE_PICTURE 116
#define IDC_MP_QUICK_MODE_DESCRIPTION 117
Expand Down

0 comments on commit ea5ebd4

Please sign in to comment.