diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp index 5b8a733724b..10a599af0d4 100644 --- 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 index 2662600aaee..f99de009053 100644 --- 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 index 07287d74cea..e9e639ecaeb 100644 --- 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 index a5a32a85188..05b86358f80 100644 --- 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.