Merge pull request #301 from CBATeam/linux

use BIS_fnc_selectRandom for 1.54 compat
CBATeam · Mar 19, 2016 · 43e8577 · 43e8577
2 parents 9f17700 + 355c31d
commit 43e8577
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/addons/help/fnc_setCreditsLine.sqf b/addons/help/fnc_setCreditsLine.sqf
@@ -37,7 +37,7 @@ if (CBA_DisableCredits) exitWith {};
 
 // find addon with author
 private _config = configFile >> "CfgPatches";
-private _entry = selectRandom ("isArray (_x >> 'author')" configClasses _config);
+private _entry = ("isArray (_x >> 'author') && {!(getArray (_x >> 'author') isEqualTo [])}" configClasses _config) call (uiNamespace getVariable "BIS_fnc_selectRandom"); //bwc for 1.54 (Linux build)
 
 if (isNil "_entry") exitWith {};
 

diff --git a/addons/jr/config.cpp b/addons/jr/config.cpp
@@ -24,14 +24,12 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"A3_Weapons_F","A3_Weapons_F_Mark"};
-        author[] = {"Robalo"};
     };
     class asdg_jointmuzzles { //compat
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"A3_Weapons_F","A3_Weapons_F_Mark"};
-        author[] = {"Robalo"};
     };
 };
 

diff --git a/addons/jr_prep/config.cpp b/addons/jr_prep/config.cpp
@@ -7,7 +7,6 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"A3_Weapons_F","A3_Weapons_F_Mark"};
         version = VERSION;
-        author[] = {"Robalo"};
         authorUrl = "https://github.com/CBATeam/CBA_A3";
     };
 };

diff --git a/addons/xeh/config.cpp b/addons/xeh/config.cpp
@@ -14,10 +14,10 @@ class CfgPatches {
     };
 
     // Backwards compatibility
-    class cba_xeh_a3: ADDON {};
-    class Extended_EventHandlers: ADDON {};
-    class CBA_Extended_EventHandlers: ADDON {};
-    class cba_ee: ADDON {};
+    class cba_xeh_a3: ADDON {author[] = {};};
+    class Extended_EventHandlers: ADDON {author[] = {};};
+    class CBA_Extended_EventHandlers: ADDON {author[] = {};};
+    class cba_ee: ADDON {author[] = {};};
 };
 
 #include "CfgEventHandlers.hpp"