Apply physics overrides correctly during anticheat calculations (#6970)

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

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 9c4d70f7d605ef79a7dba8f68e032f7790f58721..d21016f45733a0612eb2870f19045485a2a97f7d 100644 (file)
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -62,22 +62,15 @@ ClientMap::ClientMap(
 
 MapSector * ClientMap::emergeSector(v2s16 p2d)
 {
-       DSTACK(FUNCTION_NAME);
        // Check that it doesn't exist already
-       try{
+       try {
                return getSectorNoGenerate(p2d);
-       }
-       catch(InvalidPositionException &e)
-       {
+       } catch(InvalidPositionException &e) {
        }
 
        // Create a sector
-       ClientMapSector *sector = new ClientMapSector(this, p2d, m_gamedef);
-
-       {
-               //MutexAutoLock lock(m_sector_mutex); // Bulk comment-out
-               m_sectors[p2d] = sector;
-       }
+       MapSector *sector = new MapSector(this, p2d, m_gamedef);
+       m_sectors[p2d] = sector;
 
        return sector;
 }
@@ -280,8 +273,8 @@ struct MeshBufListList
 
        void clear()
        {
-               for (int l = 0; l < MAX_TILE_LAYERS; l++)
-                       lists[l].clear();
+               for (auto &list : lists)
+                       list.clear();
        }
 
        void add(scene::IMeshBuffer *buf, u8 layer)
@@ -309,8 +302,6 @@ struct MeshBufListList
 
 void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 {
-       DSTACK(FUNCTION_NAME);
-
        bool is_transparent_pass = pass == scene::ESNRP_TRANSPARENT;
 
        std::string prefix;
@@ -447,9 +438,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        }
 
        // Render all layers in order
-       for (int layer = 0; layer < MAX_TILE_LAYERS; layer++) {
-               std::vector<MeshBufList> &lists = drawbufs.lists[layer];
-
+       for (auto &lists : drawbufs.lists) {
                int timecheck_counter = 0;
                for (MeshBufList &list : lists) {
                        timecheck_counter++;