Tune caves

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

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index fb3bbf7a7fb466c8316ed791132befc537714b15..70cb0e370c18146d1ea4dc7f375ff3c10a0fcef4 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -59,10 +59,8 @@ MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy):
                reallocate();
        
 #ifndef SERVER
-       m_mesh_expired = false;
-       mesh_mutex.Init();
+       //mesh_mutex.Init();
        mesh = NULL;
-       m_temp_mods_mutex.Init();
 #endif
 }
 
@@ -70,11 +68,11 @@ MapBlock::~MapBlock()
 {
 #ifndef SERVER
        {
-               JMutexAutoLock lock(mesh_mutex);
+               //JMutexAutoLock lock(mesh_mutex);
                
                if(mesh)
                {
-                       mesh->drop();
+                       delete mesh;
                        mesh = NULL;
                }
        }
@@ -147,78 +145,6 @@ MapNode MapBlock::getNodeParentNoEx(v3s16 p)
        }
 }
 
-#ifndef SERVER
-
-#if 1
-void MapBlock::updateMesh(u32 daynight_ratio)
-{
-#if 0
-       /*
-               DEBUG: If mesh has been generated, don't generate it again
-       */
-       {
-               JMutexAutoLock meshlock(mesh_mutex);
-               if(mesh != NULL)
-                       return;
-       }
-#endif
-
-       MeshMakeData data;
-       data.fill(daynight_ratio, this);
-       
-       scene::SMesh *mesh_new = makeMapBlockMesh(&data, m_gamedef);
-       
-       /*
-               Replace the mesh
-       */
-
-       replaceMesh(mesh_new);
-
-}
-#endif
-
-void MapBlock::replaceMesh(scene::SMesh *mesh_new)
-{
-       mesh_mutex.Lock();
-
-       //scene::SMesh *mesh_old = mesh[daynight_i];
-       //mesh[daynight_i] = mesh_new;
-
-       scene::SMesh *mesh_old = mesh;
-       mesh = mesh_new;
-       setMeshExpired(false);
-       
-       if(mesh_old != NULL)
-       {
-               // Remove hardware buffers of meshbuffers of mesh
-               // NOTE: No way, this runs in a different thread and everything
-               /*u32 c = mesh_old->getMeshBufferCount();
-               for(u32 i=0; i<c; i++)
-               {
-                       IMeshBuffer *buf = mesh_old->getMeshBuffer(i);
-               }*/
-               
-               /*infostream<<"mesh_old->getReferenceCount()="
-                               <<mesh_old->getReferenceCount()<<std::endl;
-               u32 c = mesh_old->getMeshBufferCount();
-               for(u32 i=0; i<c; i++)
-               {
-                       scene::IMeshBuffer *buf = mesh_old->getMeshBuffer(i);
-                       infostream<<"buf->getReferenceCount()="
-                                       <<buf->getReferenceCount()<<std::endl;
-               }*/
-
-               // Drop the mesh
-               mesh_old->drop();
-
-               //delete mesh_old;
-       }
-
-       mesh_mutex.Unlock();
-}
-       
-#endif // !SERVER
-
 /*
        Propagates sunlight down through the block.
        Doesn't modify nodes that are not affected by sunlight.
@@ -1157,28 +1083,24 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                if(nodedef->getId("default:stone") == data[i].getContent()
                                && data[i].getParam1() == 1)
                {
-                       //dstream << "legacy coal\n";
                        data[i].setContent(nodedef->getId("default:stone_with_coal"));
                        data[i].setParam1(0);
                }
                else if(nodedef->getId("default:stone") == data[i].getContent()
                                && data[i].getParam1() == 2)
                {
-                       //dstream << "legacy iron\n";
                        data[i].setContent(nodedef->getId("default:stone_with_iron"));
                        data[i].setParam1(0);
                }
                // facedir_simple
                if(f.legacy_facedir_simple)
                {
-                       dstream << "legacy_facedir_simple\n";
                        data[i].setParam2(data[i].getParam1());
                        data[i].setParam1(0);
                }
                // wall_mounted
                if(f.legacy_wallmounted)
                {
-                       dstream << "legacy_wallmounted\n";
                        u8 wallmounted_new_to_old[8] = {0x04, 0x08, 0x01, 0x02, 0x10, 0x20, 0, 0};
                        u8 dir_old_format = data[i].getParam2();
                        u8 dir_new_format = 0;
@@ -1236,13 +1158,6 @@ std::string analyze_block(MapBlock *block)
        else
                desc<<"is_ug [ ], ";
 
-#ifndef SERVER
-       if(block->getMeshExpired())
-               desc<<"mesh_exp [X], ";
-       else
-               desc<<"mesh_exp [ ], ";
-#endif
-
        if(block->getLightingExpired())
                desc<<"lighting_exp [X], ";
        else