Mgvalleys: use standard caves

[minetest.git] / src / clientmap.cpp

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 1c420b5f9adbe348f7ae2054371a83f526659ba0..b865c2780df92b0c5b9ca2e08236db731dba1e59 100644 (file)
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -24,12 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <matrix4.h>
 #include "log.h"
 #include "mapsector.h"
-#include "main.h" // dout_client, g_settings
 #include "nodedef.h"
 #include "mapblock.h"
 #include "profiler.h"
 #include "settings.h"
-#include "camera.h" // CameraModes
+#include "camera.h"               // CameraModes
 #include "util/mathconstants.h"
 #include <algorithm>
 
@@ -71,7 +70,7 @@ ClientMap::ClientMap(
 
 ClientMap::~ClientMap()
 {
-       /*JMutexAutoLock lock(mesh_mutex);
+       /*MutexAutoLock lock(mesh_mutex);
 
        if(mesh != NULL)
        {
@@ -82,7 +81,7 @@ ClientMap::~ClientMap()
 
 MapSector * ClientMap::emergeSector(v2s16 p2d)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        // Check that it doesn't exist already
        try{
                return getSectorNoGenerate(p2d);
@@ -95,41 +94,13 @@ MapSector * ClientMap::emergeSector(v2s16 p2d)
        ClientMapSector *sector = new ClientMapSector(this, p2d, m_gamedef);
 
        {
-               //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
+               //MutexAutoLock lock(m_sector_mutex); // Bulk comment-out
                m_sectors[p2d] = sector;
        }
 
        return sector;
 }
 
-#if 0
-void ClientMap::deSerializeSector(v2s16 p2d, std::istream &is)
-{
-       DSTACK(__FUNCTION_NAME);
-       ClientMapSector *sector = NULL;
-
-       //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
-
-       core::map<v2s16, MapSector*>::Node *n = m_sectors.find(p2d);
-
-       if(n != NULL)
-       {
-               sector = (ClientMapSector*)n->getValue();
-               assert(sector->getId() == MAPSECTOR_CLIENT);
-       }
-       else
-       {
-               sector = new ClientMapSector(this, p2d);
-               {
-                       //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
-                       m_sectors.insert(p2d, sector);
-               }
-       }
-
-       sector->deSerialize(is);
-}
-#endif
-
 void ClientMap::OnRegisterSceneNode()
 {
        if(IsVisible)
@@ -186,12 +157,12 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
        }
        m_drawlist.clear();
 
-       m_camera_mutex.Lock();
+       m_camera_mutex.lock();
        v3f camera_position = m_camera_position;
        v3f camera_direction = m_camera_direction;
        f32 camera_fov = m_camera_fov;
        //v3s16 camera_offset = m_camera_offset;
-       m_camera_mutex.Unlock();
+       m_camera_mutex.unlock();
 
        // Use a higher fov to accomodate faster camera movements.
        // Blocks are cropped better when they are drawn.
@@ -257,7 +228,7 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
                u32 sector_blocks_drawn = 0;
 
                for(MapBlockVect::iterator i = sectorblocks.begin();
-                               i != sectorblocks.end(); i++)
+                               i != sectorblocks.end(); ++i)
                {
                        MapBlock *block = *i;
 
@@ -292,7 +263,7 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
                                Ignore if mesh doesn't exist
                        */
                        {
-                               //JMutexAutoLock lock(block->mesh_mutex);
+                               //MutexAutoLock lock(block->mesh_mutex);
 
                                if(block->mesh == NULL){
                                        blocks_in_range_without_mesh++;
@@ -429,7 +400,7 @@ struct MeshBufListList
 
 void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        bool is_transparent_pass = pass == scene::ESNRP_TRANSPARENT;
 
@@ -462,11 +433,11 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        int crack = m_client->getCrackLevel();
        u32 daynight_ratio = m_client->getEnv().getDayNightRatio();
 
-       m_camera_mutex.Lock();
+       m_camera_mutex.lock();
        v3f camera_position = m_camera_position;
        v3f camera_direction = m_camera_direction;
        f32 camera_fov = m_camera_fov;
-       m_camera_mutex.Unlock();
+       m_camera_mutex.unlock();
 
        /*
                Get all blocks and draw all visible ones
@@ -533,7 +504,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 
                // Mesh animation
                {
-                       //JMutexAutoLock lock(block->mesh_mutex);
+                       //MutexAutoLock lock(block->mesh_mutex);
                        MapBlockMesh *mapBlockMesh = block->mesh;
                        assert(mapBlockMesh);
                        // Pretty random but this should work somewhat nicely
@@ -563,12 +534,12 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                        Get the meshbuffers of the block
                */
                {
-                       //JMutexAutoLock lock(block->mesh_mutex);
+                       //MutexAutoLock lock(block->mesh_mutex);
 
                        MapBlockMesh *mapBlockMesh = block->mesh;
                        assert(mapBlockMesh);
 
-                       scene::SMesh *mesh = mapBlockMesh->getMesh();
+                       scene::IMesh *mesh = mapBlockMesh->getMesh();
                        assert(mesh);
 
                        u32 c = mesh->getMeshBufferCount();
@@ -828,9 +799,9 @@ void ClientMap::renderPostFx(CameraMode cam_mode)
        // Sadly ISceneManager has no "post effects" render pass, in that case we
        // could just register for that and handle it in renderMap().
 
-       m_camera_mutex.Lock();
+       m_camera_mutex.lock();
        v3f camera_position = m_camera_position;
-       m_camera_mutex.Unlock();
+       m_camera_mutex.unlock();
 
        MapNode n = getNodeNoEx(floatToInt(camera_position, BS));