Arsenal - Fix duplicate defines (#10380)

acemod · Oct 11, 2024 · b82f80a · b82f80a
1 parent c1d4ecf
commit b82f80a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp
@@ -8,12 +8,18 @@
 #define WIDTH_SINGLE ((WIDTH_TOTAL - 7 * WIDTH_GAP) / 6)
 
 // IDDs
+#ifndef IDD_MISSION
 #define IDD_MISSION 46
+#endif
 #define IDD_RSCDISPLAYCURATOR 312
 #define IDD_DISPLAY3DEN 313
 
+#ifndef IDC_OK
 #define IDC_OK 1 // emulate "OK" button
+#endif
+#ifndef IDC_CANCEL
 #define IDC_CANCEL 2 // emulate "Cancel" button
+#endif
 
 // Sorting
 #define ASCENDING 0

diff --git a/addons/arsenal/functions/fnc_itemInfo.sqf b/addons/arsenal/functions/fnc_itemInfo.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
-#include "..\defines.hpp"
 #include "\a3\ui_f\hpp\defineResincl.inc"
+#include "..\defines.hpp"
 /*
  * Author: Alganthe, johnb43
  * Update arsenal's info box.

diff --git a/addons/arsenal/functions/fnc_onPanelDblClick.sqf b/addons/arsenal/functions/fnc_onPanelDblClick.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
-#include "..\defines.hpp"
 #include "\a3\ui_f\hpp\defineResincl.inc"
+#include "..\defines.hpp"
 /*
  * Author: LinkIsGrim
  * Add or remove item(s) to favorites when LShift is pressed

diff --git a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
-#include "..\defines.hpp"
 #include "\a3\ui_f\hpp\defineResincl.inc"
+#include "..\defines.hpp"
 /*
  * Author: Alganthe, johnb43
  * Handles selection changes on the left panel.