X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientenvironment.cpp;h=af00586c5379f155d42f374143e966615d617b89;hb=ee9a442ecc26f2623a1b085344d37636342973eb;hp=2a5adea75f4204e0518441c297044b38d7f5f698;hpb=fd3afbced5410639325e730d5710b8b5039b320e;p=minetest.git

diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index 2a5adea75..af00586c5 100644
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -79,7 +79,6 @@ ClientMap & ClientEnvironment::getClientMap()
 
 void ClientEnvironment::setLocalPlayer(LocalPlayer *player)
 {
-	DSTACK(FUNCTION_NAME);
 	/*
 		It is a failure if already is a local player
 	*/
@@ -91,8 +90,6 @@ void ClientEnvironment::setLocalPlayer(LocalPlayer *player)
 
 void ClientEnvironment::step(float dtime)
 {
-	DSTACK(FUNCTION_NAME);
-
 	/* Step time of day */
 	stepTimeOfDay(dtime);
 
@@ -245,78 +242,6 @@ void ClientEnvironment::step(float dtime)
 		m_script->environment_step(dtime);
 	}
 
-	// Protocol v29 make this behaviour obsolete
-	if (getGameDef()->getProtoVersion() < 29) {
-		if (m_lava_hurt_interval.step(dtime, 1.0)) {
-			v3f pf = lplayer->getPosition();
-
-			// Feet, middle and head
-			v3s16 p1 = floatToInt(pf + v3f(0, BS * 0.1, 0), BS);
-			MapNode n1 = m_map->getNodeNoEx(p1);
-			v3s16 p2 = floatToInt(pf + v3f(0, BS * 0.8, 0), BS);
-			MapNode n2 = m_map->getNodeNoEx(p2);
-			v3s16 p3 = floatToInt(pf + v3f(0, BS * 1.6, 0), BS);
-			MapNode n3 = m_map->getNodeNoEx(p3);
-
-			u32 damage_per_second = 0;
-			damage_per_second = MYMAX(damage_per_second,
-				m_client->ndef()->get(n1).damage_per_second);
-			damage_per_second = MYMAX(damage_per_second,
-				m_client->ndef()->get(n2).damage_per_second);
-			damage_per_second = MYMAX(damage_per_second,
-				m_client->ndef()->get(n3).damage_per_second);
-
-			if (damage_per_second != 0)
-				damageLocalPlayer(damage_per_second, true);
-		}
-
-		/*
-			Drowning
-		*/
-		if (m_drowning_interval.step(dtime, 2.0)) {
-			v3f pf = lplayer->getPosition();
-
-			// head
-			v3s16 p = floatToInt(pf + v3f(0, BS * 1.6, 0), BS);
-			MapNode n = m_map->getNodeNoEx(p);
-			ContentFeatures c = m_client->ndef()->get(n);
-			u8 drowning_damage = c.drowning;
-			if (drowning_damage > 0 && lplayer->hp > 0) {
-				u16 breath = lplayer->getBreath();
-				if (breath > 10) {
-					breath = 11;
-				}
-				if (breath > 0) {
-					breath -= 1;
-				}
-				lplayer->setBreath(breath);
-				updateLocalPlayerBreath(breath);
-			}
-
-			if (lplayer->getBreath() == 0 && drowning_damage > 0) {
-				damageLocalPlayer(drowning_damage, true);
-			}
-		}
-		if (m_breathing_interval.step(dtime, 0.5)) {
-			v3f pf = lplayer->getPosition();
-
-			// head
-			v3s16 p = floatToInt(pf + v3f(0, BS * 1.6, 0), BS);
-			MapNode n = m_map->getNodeNoEx(p);
-			ContentFeatures c = m_client->ndef()->get(n);
-			if (!lplayer->hp) {
-				lplayer->setBreath(11);
-			} else if (c.drowning == 0) {
-				u16 breath = lplayer->getBreath();
-				if (breath <= 10) {
-					breath += 1;
-					lplayer->setBreath(breath);
-					updateLocalPlayerBreath(breath);
-				}
-			}
-		}
-	}
-
 	// Update lighting on local player (used for wield item)
 	u32 day_night_ratio = getDayNightRatio();
 	{