Roll back to old swimming in ground fix

See
e8e5d24e80 (commitcomment-19053648)
comments

SQF/dayz_code/compile/local_spawnObjects.sqf

@@ -36,5 +36,5 @@ _fires = [
 	_object setPos (_x select 1);
 	_object allowDamage false;
 	if !(_type in _fires) then {_object enableSimulation false;};
-	_object setVariable ["", true]; // stops global setVariable by sched_townGenerator, checked in player_spawnCheck for loot spawn
+	_object setVariable ["",true,false]; // stops global setVariable by sched_townGenerator, checked in player_spawnCheck for loot spawn
 } count _this;

SQF/dayz_code/system/mission/debug_floor.sqf

@@ -0,0 +1,18 @@
+/*
+	Fixes swimming in ground after spawn, change clothes or relog
+	on maps with respawn_west position in water.
+*/
+
+private ["_debug","_floor"];
+
+_debug = getMarkerPos "respawn_west";
+
+if (surfaceIsWater _debug) then {
+	_debug set [2,2];
+	_floor = "MetalFloor_DZ" createVehicleLocal [0,0,0];
+	_floor setPosASL _debug;
+	_floor allowDamage false;
+	_floor enableSimulation false;
+	_floor setVariable ["",true,false]; // stops global setVariable by sched_townGenerator, checked in player_spawnCheck for loot spawn
+	_floor hideObject true;
+};

SQF/dayz_code/system/player_monitor.fsm

@@ -1966,12 +1966,7 @@ class FSM
                          "Dayz_logonTown = ""Wilderness"";" \n
                          "if (count _nearestCity > 0) then {Dayz_logonTown = text (_nearestCity select 0)};" \n
                          "" \n
-                         "[_world,Dayz_logonTown,format[localize ""str_player_06"",dayz_Survived]] spawn {" \n
-						 "	uiSleep 1;" \n
-						 "  if (dayz_isSwimming && !surfaceIsWater (getPosASL player)) then {player setPosATL [getPosATL player select 0,getPosATL player select 1,(getPosATL player select 2)+.1];}; //Fix swimming in ground glitch on some maps" \n
-						 "	uiSleep 4;" \n
-						 "	_this spawn BIS_fnc_infoText;" \n
-						 "};" \n
+                         "[_world,Dayz_logonTown,format[localize ""str_player_06"",dayz_Survived]] spawn {uiSleep 5; _this spawn BIS_fnc_infoText;};" \n
                          "" \n
                          "dayz_myPosition = getPosATL player;" \n
                          "Dayz_loginCompleted = true;" \n

Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\takistan.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\mountains_acr.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus11.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\isladuala.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\tavi.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\namalsk.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\panthera2.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus17.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fdf_isle1_a.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\utes.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fapovo.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\caribou.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\smd_sahrani_a2.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\cmr_ovaron.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\napf.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "custom\compiles.sqf"; //Compile custom compiles
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on each machine early
 initialized = true;

Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\shapur_baf.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\zargabad.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\bootcamp_acr.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\lingor.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\provinggrounds_pmc.sqf"; //Add trader city objects locally on each machine early
 initialized = true;
 

Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf

@@ -102,6 +102,7 @@ progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\woodland_acr.sqf"; //Add trader city objects locally on each machine early
 initialized = true;