Merge branch 'Development' into Experimental

@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_cleanupTemporaryMarkers.sqf

@@ -12,11 +12,11 @@ for "_i" from 1 to (count blck_temporaryMarkers) do
 {
 	if (_i > (count blck_temporaryMarkers)) exitWith {};
 	private _m = blck_temporaryMarkers deleteAt 0;
-	_m params["_marker","_deleteAt"];
+	_m params[["_marker",""],["_deleteAt",0]];
 	if (diag_tickTime > _deleteAt) then 
 	{
 		deleteMarker _marker;
 	} else {
 		blck_temporaryMarkers pushBack _m;
 	};
-};
+};

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_cleanUpObjects.sqf

@@ -19,13 +19,22 @@
 for "_i" from 1 to (count blck_oldMissionObjects) do {
 	if (_i <= count blck_oldMissionObjects) then {
 		private _oldObjs = blck_oldMissionObjects deleteAt 0;
-		_oldObjs params ["_missionCenter","_objarr","_timer"];
+		_oldObjs params [["_missionCenter",[0,0,0]],["_objarr",[]],["_timer",0]];
 		if (diag_tickTime > _timer) then 
 		{
 			private _nearplayer = [_missionCenter,800] call blck_fnc_nearestPlayers;
 			if (_nearPlayer isEqualTo []) then 
 			{
-				{deleteVehicle _x}forEach _objarr;
+				{
+					if (typeName _x isEqualTo "OBJECT") then {deleteVehicle _x};
+					if (_x isEqualType []) then 
+					{
+						//[format["_fnc_cleanUpObjects:  case of _x is array: %1",_x]] call blck_fnc_log;
+						{
+							if (typeName _x isEqualTo "OBJECT") then {deleteVehicle _x};
+						} forEach _x;
+					};
+				} forEach _objarr;
 			} else {
 				blck_oldMissionObjects pushback _oldObjs;
 			};

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf

@@ -468,15 +468,6 @@ for "_i" from 1 to (count blck_activeMissionsList) do
 
 				_missionData = [_coords,_mines,_objects,_hiddenObjects,_crates, _blck_AllMissionAI,_assetSpawned,_missionAIVehicles,_markers];
 				
-				/*
-				{
-						diag_log format["_monitorInitializedMissions (363): %1 = %2",_vars select _forEachIndex,_x];
-				} forEach [_objects,_hiddenObjects,_crates];
-				{
-					diag_log format["_monitorInitializedMission (369): _missionData %1 = %2",_vars select _foreachIndex,_missionData select _x];
-				} forEach [2,3,4,5];
-				*/
-
 				_el set[missionData, _missionData];
 
 				// If there were no throws then lets check on the mission in a bit.
@@ -570,4 +561,7 @@ for "_i" from 1 to (count blck_activeMissionsList) do
 			blck_activeMissionsList pushBack _el;
 		};
 	};
+
 };
+
+blck_activeMonitorThreads = blck_activeMonitorThreads - 1;

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnEmplacedWeaponArray.sqf

@@ -28,6 +28,8 @@ _abort = false;
 _pos = [];
 
 private _emplacedWepData = +_missionEmplacedWeapons;
+//diag_log format["_spawnEmplacedWeaponArray(30): _noEmplacedWeapons = %1 | _emplacedWepData = %2",_noEmplacedWeapons,_emplacedWepData];
+
 // Define _emplacedWepData if not already configured.
 if (_emplacedWepData isEqualTo []) then
 {
@@ -40,6 +42,8 @@ if (_emplacedWepData isEqualTo []) then
 	_useRelativePos = false;
 };
 
+//diag_log format["_spawnEmplacedWeaponArray(45): _noEmplacedWeapons = %1 | _emplacedWepData = %2",_noEmplacedWeapons,_emplacedWepData];
+
 {
 	if (_useRelativePos) then 
 	{

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf

@@ -27,7 +27,7 @@ private _vehicles = [];
 private _missionAI = [];
 private _abort = false;
 private _patrolsThisMission = +_missionPatrolVehicles;
-
+//diag_log format["_spawnMissionVehiclePatrols(30): _noVehiclePatrols = %1 | _patrolsThisMission = %2",_noVehiclePatrols,_patrolsThisMission];
 if (_patrolsThisMission isEqualTo []) then
 {
 	_useRelativePos = false;