Drop ClientEvent CEE_PLAYER_BREATH: triggering function is not called.

Also drop 3 useless IntervalLimiter
minetest · Jul 1, 2018 · 1ff15d3 · 1ff15d3
1 parent 49509d2
commit 1ff15d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
@@ -203,10 +203,7 @@ void ClientEnvironment::step(float dtime)
 			lplayer->move(dtime_part, this, position_max_increment,
 				&player_collisions);
 		}
-	}
-	while(dtime_downcount > 0.001);
-
-	//std::cout<<"Looped "<<loopcount<<" times."<<std::endl;
+	} while (dtime_downcount > 0.001);
 
 	bool player_immortal = lplayer->getCAO() && lplayer->getCAO()->isImmortal();
 
@@ -483,14 +480,6 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
 	m_client_event_queue.push(event);
 }
 
-void ClientEnvironment::updateLocalPlayerBreath(u16 breath)
-{
-	ClientEnvEvent event;
-	event.type = CEE_PLAYER_BREATH;
-	event.player_breath.amount = breath;
-	m_client_event_queue.push(event);
-}
-
 /*
 	Client likes to call these
 */

diff --git a/src/clientenvironment.h b/src/clientenvironment.h
@@ -42,8 +42,7 @@ class LocalPlayer;
 enum ClientEnvEventType
 {
 	CEE_NONE,
-	CEE_PLAYER_DAMAGE,
-	CEE_PLAYER_BREATH
+	CEE_PLAYER_DAMAGE
 };
 
 struct ClientEnvEvent
@@ -56,9 +55,6 @@ struct ClientEnvEvent
 			u8 amount;
 			bool send_to_server;
 		} player_damage;
-		struct{
-			u16 amount;
-		} player_breath;
 	};
 };
 
@@ -113,7 +109,6 @@ class ClientEnvironment : public Environment
 	*/
 
 	void damageLocalPlayer(u8 damage, bool handle_hp=true);
-	void updateLocalPlayerBreath(u16 breath);
 
 	/*
 		Client likes to call these
@@ -151,9 +146,6 @@ class ClientEnvironment : public Environment
 	std::vector<ClientSimpleObject*> m_simple_objects;
 	std::queue<ClientEnvEvent> m_client_event_queue;
 	IntervalLimiter m_active_object_light_update_interval;
-	IntervalLimiter m_lava_hurt_interval;
-	IntervalLimiter m_drowning_interval;
-	IntervalLimiter m_breathing_interval;
 	std::list<std::string> m_player_names;
 	v3s16 m_camera_offset;
 };