From 5e21f06b85a2f6b11f2e20e5476676233c6c495a Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 26 Sep 2023 21:24:35 -0500
Subject: [PATCH] Tools - Fix configs for HEMTT v1.9.0 (#1289)

---
 addons/compat_spe/SPE_Tanks.hpp               |  2 +-
 addons/sys_gsa/CfgWeapons.hpp                 |  2 -
 addons/sys_list/script_component.hpp          | 58 +++++++++++++++++++
 include/a3/ui_f/hpp/defineResincl.inc         |  8 ++-
 .../cba/addons/main/script_macros_common.hpp  | 22 +++----
 5 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/addons/compat_spe/SPE_Tanks.hpp b/addons/compat_spe/SPE_Tanks.hpp
index ddeea7b75..aa46169eb 100644
--- a/addons/compat_spe/SPE_Tanks.hpp
+++ b/addons/compat_spe/SPE_Tanks.hpp
@@ -447,7 +447,7 @@ class SPE_PzKpfwIV_G_base: SPE_Tank_base {
     };
 };
 
-class SPE_PzBefWgIV_base: SPE_PzKpfwIV_G_Base { //Command Tank Base
+class SPE_PzBefWgIV_base: SPE_PzKpfwIV_G_base { //Command Tank Base
     class AcreRacks {
         class Rack_1 {
             displayName = CSTRING(RadioSet1_GER);
diff --git a/addons/sys_gsa/CfgWeapons.hpp b/addons/sys_gsa/CfgWeapons.hpp
index 6e9a98abd..73a0582ec 100644
--- a/addons/sys_gsa/CfgWeapons.hpp
+++ b/addons/sys_gsa/CfgWeapons.hpp
@@ -1,5 +1,3 @@
-#include "script_component.hpp"
-
 class CfgWeapons {
     class CBA_MiscItem;
     class CBA_MiscItem_ItemInfo;
diff --git a/addons/sys_list/script_component.hpp b/addons/sys_list/script_component.hpp
index 0a1f3b8b3..aa9f1e6fe 100644
--- a/addons/sys_list/script_component.hpp
+++ b/addons/sys_list/script_component.hpp
@@ -18,6 +18,64 @@
 #include "\idi\acre\addons\main\script_dialog_defines.hpp"
 #include "script_dialog_defines.hpp"
 
+#undef ST_TITLE_BAR
+#undef ST_TILE_PICTURE
+#undef ST_FRAME
+#undef ST_DOWN
+#undef ST_BACKGROUND
+#undef CT_XKEYDESC
+#undef CT_OBJECT
+#undef CT_STRUCTURED_TEXT
+#undef CT_TOOLBOX
+#undef ST_MULTI
+#undef ST_PICTURE
+#undef CT_HTML
+#undef ST_GROUP_BOX
+#undef ST_NO_RECT
+#undef ST_HPOS
+#undef CT_MAP_MAIN
+#undef CT_SLIDER
+#undef CT_XCOMBO
+#undef CT_STATIC
+#undef CT_BUTTON
+#undef ST_UP
+#undef CT_CONTROLS_GROUP
+#undef CT_USER
+#undef ST_TYPE
+#undef ST_VPOS
+#undef CT_MAP
+#undef CT_XSLIDER
+#undef ST_VCENTER
+#undef ST_SHADOW
+#undef ST_WITH_RECT
+#undef CT_LINEBREAK
+#undef CT_ANIMATED_TEXTURE
+#undef CT_LISTBOX
+#undef ST_HUD_BACKGROUND
+#undef ST_KEEP_ASPECT_RATIO
+#undef CT_ACTIVETEXT
+#undef CT_CHECKBOXES
+#undef CT_PROGRESS
+#undef CT_OBJECT_CONT_ANIM
+#undef ST_POS
+#undef CT_LISTNBOX
+#undef CT_TREE
+#undef CT_SHORTCUTBUTTON
+#undef ST_CENTER
+#undef CT_CONTEXT_MENU
+#undef ST_LEFT
+#undef ST_SINGLE
+#undef ST_GROUP_BOX2
+#undef CT_XBUTTON
+#undef CT_OBJECT_CONTAINER
+#undef CT_XLISTBOX
+#undef CT_STATIC_SKEW
+#undef CT_OBJECT_ZOOM
+#undef CT_COMBO
+#undef ST_RIGHT
+#undef ST_LINE
+#undef CT_EDIT
+
 #include "\a3\ui_f\hpp\defineResincl.inc"
 #define IDD_RSCDISPLAYEGSPECTATOR 60492 // \a3\ui_f\hpp\defineResinclDesign.inc has duplicates (pboProject no like)
 #define IDD_RSCDISPLAYCURATOR 312 // \a3\ui_f_curator\ui\defineResinclDesign.inc has duplicates (pboProject no like)
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
diff --git a/include/x/cba/addons/main/script_macros_common.hpp b/include/x/cba/addons/main/script_macros_common.hpp
index 2f3980a25..7d930c66a 100644
--- a/include/x/cba/addons/main/script_macros_common.hpp
+++ b/include/x/cba/addons/main/script_macros_common.hpp
@@ -865,15 +865,10 @@ Macro: ISNILS()
 #define COMPILE_SCRIPT(var1) compileScript ['PATHTO_SYS(PREFIX,COMPONENT_F,var1)']
 
 
-#define VERSIONING_SYS(var1) class CfgSettings \
-{ \
-    class CBA \
-    { \
-        class Versioning \
-        { \
-            class var1 \
-            { \
-            }; \
+#define VERSIONING_SYS(var1) class CfgSettings { \
+    class CBA { \
+        class Versioning { \
+            class var1 {}; \
         }; \
     }; \
 };
@@ -1040,12 +1035,9 @@ Macro: PATHTO_FNC()
 #define QQEFUNC(var1,var2) QUOTE(QEFUNC(var1,var2))
 
 #ifndef PRELOAD_ADDONS
-    #define PRELOAD_ADDONS class CfgAddons \
-{ \
-    class PreloadAddons \
-    { \
-        class ADDON \
-        { \
+    #define PRELOAD_ADDONS class CfgAddons { \
+    class PreloadAddons { \
+        class ADDON { \
             list[]={ QUOTE(ADDON) }; \
         }; \
     }; \