From 84f9f57e45bd3894f285cdefbae401d7b6fcccbd Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 20 Jun 2019 13:52:54 +0200 Subject: [PATCH 1/3] Quote version in version config macro --- addons/main/script_macros_common.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp index 18f33c785..e22b18ace 100644 --- a/addons/main/script_macros_common.hpp +++ b/addons/main/script_macros_common.hpp @@ -60,7 +60,7 @@ #endif #ifndef VERSION_CONFIG - #define VERSION_CONFIG version = VERSION; versionStr = QUOTE(VERSION); versionAr[] = {VERSION_AR} + #define VERSION_CONFIG version = QUOTE(VERSION); versionStr = QUOTE(VERSION); versionAr[] = {VERSION_AR} #endif #define ADDON DOUBLES(PREFIX,COMPONENT) From a181b44880caba6adb7fe6a50c9a339c90c756cb Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 20 Jun 2019 13:47:00 +0200 Subject: [PATCH 2/3] Fix BOM --- addons/optics/script_component.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/optics/script_component.hpp b/addons/optics/script_component.hpp index fb0d12c64..57bfe3a47 100644 --- a/addons/optics/script_component.hpp +++ b/addons/optics/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT optics +#define COMPONENT optics #include "\x\cba\addons\main\script_mod.hpp" //#define DEBUG_MODE_FULL From 6d0a010379a3f71ddbd3de0ba1e098c772d75d2a Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 22 Jul 2019 15:58:18 +0200 Subject: [PATCH 3/3] Fix flexiMenu BOM --- addons/ui/flexiMenu/data/menu_arma2.hpp | 2 +- addons/ui/flexiMenu/data/menu_buttonList.hpp | 2 +- addons/ui/flexiMenu/data/menu_iconRow.hpp | 2 +- addons/ui/flexiMenu/data/menu_popup.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/ui/flexiMenu/data/menu_arma2.hpp b/addons/ui/flexiMenu/data/menu_arma2.hpp index fd043acc8..ade44fbde 100644 --- a/addons/ui/flexiMenu/data/menu_arma2.hpp +++ b/addons/ui/flexiMenu/data/menu_arma2.hpp @@ -1,4 +1,4 @@ -//#include "\x\cba\addons\ui\script_component.hpp" +//#include "\x\cba\addons\ui\script_component.hpp" #define _DefaultAspectRatio 3 / 4 #define _SX (safeZoneX+safeZoneW / 2) // screen centre x diff --git a/addons/ui/flexiMenu/data/menu_buttonList.hpp b/addons/ui/flexiMenu/data/menu_buttonList.hpp index 7b8b6d7bc..51a649aed 100644 --- a/addons/ui/flexiMenu/data/menu_buttonList.hpp +++ b/addons/ui/flexiMenu/data/menu_buttonList.hpp @@ -1,4 +1,4 @@ -//#include "\x\cba\addons\ui\script_component.hpp" +//#include "\x\cba\addons\ui\script_component.hpp" #define _imagePath(TOKEN) QUOTE(PATHTOF(flexiMenu)\data\buttonList\TOKEN.paa) #define _SX (safeZoneX + safeZoneW / 2) // screen centre x diff --git a/addons/ui/flexiMenu/data/menu_iconRow.hpp b/addons/ui/flexiMenu/data/menu_iconRow.hpp index 9cbe5cee1..7e4518d92 100644 --- a/addons/ui/flexiMenu/data/menu_iconRow.hpp +++ b/addons/ui/flexiMenu/data/menu_iconRow.hpp @@ -1,4 +1,4 @@ - //#include "\x\cba\addons\ui\script_component.hpp" +//#include "\x\cba\addons\ui\script_component.hpp" #define _imagePath(TOKEN) QUOTE(PATHTOF(flexiMenu)\data\arma2\TOKEN.paa) #define _SX (safeZoneX + safeZoneW / 2) // screen centre x diff --git a/addons/ui/flexiMenu/data/menu_popup.hpp b/addons/ui/flexiMenu/data/menu_popup.hpp index da635f9ff..64a94aa2b 100644 --- a/addons/ui/flexiMenu/data/menu_popup.hpp +++ b/addons/ui/flexiMenu/data/menu_popup.hpp @@ -1,4 +1,4 @@ -// #include "\x\cba\addons\ui\script_component.hpp" +// #include "\x\cba\addons\ui\script_component.hpp" #define _imagePath(TOKEN) QUOTE(PATHTOF(flexiMenu)\data\popup\TOKEN.paa) #define _SX (safeZoneX + safeZoneW / 2) //screen centre x