Drop ClientEvent CEE_PLAYER_BREATH: triggering function is not called.

Also drop 3 useless IntervalLimiter

diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index 76ac080d4e976fb6b370db01afcd666036354aa9..53e3f783a0acbb9b5238c9d4b2594d232b13a698 100644 (file)
--- 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
index 12070afec723c275f51b3b61415b816b3fabdbab..606070e3aca5502d089198195dc3ea1374816b8a 100644 (file)
--- 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 @@ public:
        */
 
        void damageLocalPlayer(u8 damage, bool handle_hp=true);
-       void updateLocalPlayerBreath(u16 breath);
 
        /*
                Client likes to call these
@@ -151,9 +146,6 @@ private:
        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;
 };