Fix a memleak pointed by @Zeno- in MeshUpdateQueue

[oweals/minetest.git] / src / clientenvironment.cpp

diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index 94c8e0dcb71f14ecfdaea18c027ba8994a4c8737..47df49b845dee3b13a134e6d604b857609633e40 100644 (file)
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientenvironment.h"
 #include "clientsimpleobject.h"
 #include "clientmap.h"
-#include "clientscripting.h"
+#include "scripting_client.h"
 #include "mapblock_mesh.h"
 #include "event.h"
 #include "collision.h"
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "raycast.h"
 #include "voxelalgorithms.h"
 #include "settings.h"
+#include <algorithm>
 
 /*
        ClientEnvironment
@@ -252,37 +253,31 @@ void ClientEnvironment::step(float dtime)
                m_script->environment_step(dtime);
        }
 
-       /*
-               A quick draft of lava damage
-       */
-       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);
-               }
-       }
-
        // 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
                */
@@ -604,15 +599,13 @@ void ClientEnvironment::getActiveObjects(v3f origin, f32 max_d,
        }
 }
 
-ClientEnvEvent ClientEnvironment::getClientEvent()
+ClientEnvEvent ClientEnvironment::getClientEnvEvent()
 {
-       ClientEnvEvent event;
-       if(m_client_event_queue.empty())
-               event.type = CEE_NONE;
-       else {
-               event = m_client_event_queue.front();
-               m_client_event_queue.pop();
-       }
+       FATAL_ERROR_IF(m_client_event_queue.empty(),
+                       "ClientEnvironment::getClientEnvEvent(): queue is empty");
+
+       ClientEnvEvent event = m_client_event_queue.front();
+       m_client_event_queue.pop();
        return event;
 }