Merge pull request #248 from gruppe-adler/use-grad-islandconfig

switch to grad-islandconfig
gruppe-adler · Sep 8, 2019 · cdc22a8 · cdc22a8
2 parents dab6c69 + 066ae0f
commit cdc22a8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 700 deletions.
diff --git a/BC_setup/cfgFunctions.hpp b/BC_setup/cfgFunctions.hpp
@@ -23,7 +23,7 @@ class BC_setup {
         class findRandomPos;
 		class fuelDrain;
         class getHighestRankOfSide;
-        class getIslandCfgEntry { preInit = 1; };
+        class getIslandCfgEntry {};
         class initialSpawnServer;
         class registerDynamicGroup;
 		class removeFuelStations { postInit = 1; };

diff --git a/BC_setup/functions/client/fn_initialSpawnClient.sqf b/BC_setup/functions/client/fn_initialSpawnClient.sqf
@@ -1,7 +1,7 @@
 private _playerPositionsForCurrentWorld = 	[
-	[(missionConfigFile >> "CfgIslands" >> worldName), "spawnPosOpf", [0,0,0]] call BIS_fnc_returnConfigEntry,
-	[(missionConfigFile >> "CfgIslands" >> worldName), "spawnPosBlu", [0,0,0]] call BIS_fnc_returnConfigEntry,
-	[(missionConfigFile >> "CfgIslands" >> worldName), "spawnPosInd", [0,0,0]] call BIS_fnc_returnConfigEntry
+	["spawnPosOpf", [0,0,0]] call BC_setup_fnc_getIslandCfgEntry,
+	["spawnPosBlu", [0,0,0]] call BC_setup_fnc_getIslandCfgEntry,
+	["spawnPosInd", [0,0,0]] call BC_setup_fnc_getIslandCfgEntry
 ];
 
 [{!isNull player}, {
@@ -16,4 +16,4 @@ private _playerPositionsForCurrentWorld = 	[
 	_tmpPos = [_targetPosition,[0,10],[0,360]] call BC_setup_fnc_findRandomPos;
 	player setPos [_tmpPos select 0, _tmpPos select 1, 0]; // force to ZERO height
 	player switchmove "AmovPercMstpSnonWnonDnon";
-}, [_playerPositionsForCurrentWorld]] call CBA_fnc_waitUntilAndExecute;
+}, [_playerPositionsForCurrentWorld]] call CBA_fnc_waitUntilAndExecute;
diff --git a/BC_setup/functions/server/fn_getIslandCfgEntry.sqf b/BC_setup/functions/server/fn_getIslandCfgEntry.sqf
@@ -2,8 +2,8 @@
 
 params ["_entryName",["_defaultValue",false]];
 
-private _return = [(missionConfigFile >> "CfgIslands" >> worldName), _entryName, _defaultValue] call BIS_fnc_returnConfigEntry;
+private _return = [(missionConfigFile >> "cfgGradIslands" >> worldName), _entryName, _defaultValue] call BIS_fnc_returnConfigEntry;
 if (_return isEqualTo "true") then {_return = true};
 if (_return isEqualTo "false") then {_return = false};
 
-_return
+_return
diff --git a/BC_setup/functions/server/fn_initialSpawnServer.sqf b/BC_setup/functions/server/fn_initialSpawnServer.sqf
@@ -1,7 +1,7 @@
 private _playerPositionsForCurrentWorld = 	[
-	[(missionConfigFile >> "CfgIslands" >> worldName), "spawnPosOpf", [0,0,0]] call BIS_fnc_returnConfigEntry,
-	[(missionConfigFile >> "CfgIslands" >> worldName), "spawnPosBlu", [0,0,0]] call BIS_fnc_returnConfigEntry,
-	[(missionConfigFile >> "CfgIslands" >> worldName), "spawnPosInd", [0,0,0]] call BIS_fnc_returnConfigEntry
+	["spawnPosOpf", [0,0,0]] call BC_setup_fnc_getIslandCfgEntry,
+	["spawnPosBlu", [0,0,0]] call BC_setup_fnc_getIslandCfgEntry,
+	["spawnPosInd", [0,0,0]] call BC_setup_fnc_getIslandCfgEntry
 ];