diff --git a/addons/ui/flexiMenu/data/menu_arma2.hpp b/addons/ui/flexiMenu/data/menu_arma2.hpp index 679572061..289b768b7 100644 --- a/addons/ui/flexiMenu/data/menu_arma2.hpp +++ b/addons/ui/flexiMenu/data/menu_arma2.hpp @@ -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); diff --git a/addons/ui/flexiMenu/data/menu_buttonList.hpp b/addons/ui/flexiMenu/data/menu_buttonList.hpp index 75ce885d8..edaa63592 100644 --- a/addons/ui/flexiMenu/data/menu_buttonList.hpp +++ b/addons/ui/flexiMenu/data/menu_buttonList.hpp @@ -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); diff --git a/addons/ui/flexiMenu/data/menu_iconRow.hpp b/addons/ui/flexiMenu/data/menu_iconRow.hpp index 783ec470f..85b12be22 100644 --- a/addons/ui/flexiMenu/data/menu_iconRow.hpp +++ b/addons/ui/flexiMenu/data/menu_iconRow.hpp @@ -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); diff --git a/addons/ui/flexiMenu/data/menu_popup.hpp b/addons/ui/flexiMenu/data/menu_popup.hpp index b01b3ef52..b1295ffbc 100644 --- a/addons/ui/flexiMenu/data/menu_popup.hpp +++ b/addons/ui/flexiMenu/data/menu_popup.hpp @@ -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); diff --git a/addons/ui/flexiMenu/data/menu_rose.hpp b/addons/ui/flexiMenu/data/menu_rose.hpp index ea5aa7a8c..7cd947d62 100644 --- a/addons/ui/flexiMenu/data/menu_rose.hpp +++ b/addons/ui/flexiMenu/data/menu_rose.hpp @@ -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); diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc index 12b897259..2f513642b 100644 --- a/include/a3/ui_f/hpp/defineResincl.inc +++ b/include/a3/ui_f/hpp/defineResincl.inc @@ -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 @@ -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 @@ -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