CBATeam#198 - Use a macro for XEH configs

Storing missionconfigFile in a varaible can crash 1.55 dev branch
MikeMatrix · Nov 21, 2015 · 45a3708 · 45a3708
1 parent 6da4ad1
commit 45a3708
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/addons/xeh/init_pre.sqf b/addons/xeh/init_pre.sqf
@@ -77,7 +77,7 @@ if ( isNumber(_cfgRespawn) ) then {
     _respawn = !(getNumber(_cfgRespawn) in [0, 1, 4, 5]);
 };
 if ( isText(_cfgRespawn) ) then {
-    _respawn = !(getText(_cfgRespawn) in ["none", "bird", "group", "side"]);
+    _respawn = !((toLower getText(_cfgRespawn)) in ["none", "bird", "group", "side"]);
 };
 
 SLX_XEH_objects = []; // Temporary array, to track InitPosts at mission initialization
@@ -201,9 +201,6 @@ SLX_XEH_OTHER_EVENTS_PLAYERS = [];
   }
 } forEach SLX_XEH_OTHER_EVENTS;
 
-SLX_XEH_CONFIG_FILES = [configFile, campaignConfigFile, missionConfigFile];
-SLX_XEH_CONFIG_FILES_VARIABLE = [campaignConfigFile, missionConfigFile];
-
 SLX_XEH_DEF_CLASSES = [SLX_XEH_STR, "All"];
 
 // XEH for non XEH supported addons

diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
@@ -27,3 +27,5 @@
 
 #include "\x\cba\addons\main\script_macros.hpp"
 
+#define SLX_XEH_CONFIG_FILES [configFile, campaignConfigFile, missionConfigFile]
+#define SLX_XEH_CONFIG_FILES_VARIABLE [campaignConfigFile, missionConfigFile]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,5 @@

		#include "\x\cba\addons\main\script_macros.hpp"

		#define SLX_XEH_CONFIG_FILES [configFile, campaignConfigFile, missionConfigFile]
		#define SLX_XEH_CONFIG_FILES_VARIABLE [campaignConfigFile, missionConfigFile]