Moved the temporary mapgen test files and added a modified map.cpp too... These are...

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index e2cd432be381f9a604af70f9f2ab4549d077d25e..fa52dc26b33ca1de90ed7e3031e9a60410d9b003 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -287,6 +287,11 @@ class Map : public NodeContainer
        void removeNodeMetadata(v3s16 p);
        void nodeMetadataStep(float dtime,
                        core::map<v3s16, MapBlock*> &changed_blocks);
+       
+       /*
+               Misc.
+       */
+       core::map<v2s16, MapSector*> *getSectorsPtr(){return &m_sectors;}
 
        /*
                Variables
@@ -298,16 +303,13 @@ class Map : public NodeContainer
 
        core::map<MapEventReceiver*, bool> m_event_receivers;
        
-       // Mutex is important because on client map is accessed asynchronously
        core::map<v2s16, MapSector*> m_sectors;
-       JMutex m_sector_mutex;
+       //JMutex m_sector_mutex;
 
        // Be sure to set this to NULL when the cached sector is deleted 
        MapSector *m_sector_cache;
        v2s16 m_sector_cache_p;
 
-       //WrapperHeightmap m_hwrapper;
-       
        // Queued transforming water nodes
        UniqueQueue<v3s16> m_transforming_liquid;
 };
@@ -341,6 +343,8 @@ class ServerMap : public Map
        // Returns the position of the chunk where the sector is in
        v2s16 sector_to_chunk(v2s16 sectorpos)
        {
+               if(m_chunksize == 0)
+                       return v2s16(0,0);
                sectorpos.X += m_chunksize / 2;
                sectorpos.Y += m_chunksize / 2;
                v2s16 chunkpos = getContainerPos(sectorpos, m_chunksize);
@@ -350,6 +354,8 @@ class ServerMap : public Map
        // Returns the position of the (0,0) sector of the chunk
        v2s16 chunk_to_sector(v2s16 chunkpos)
        {
+               if(m_chunksize == 0)
+                       return v2s16(0,0);
                v2s16 sectorpos(
                        chunkpos.X * m_chunksize,
                        chunkpos.Y * m_chunksize
@@ -378,6 +384,9 @@ class ServerMap : public Map
        */
        bool chunkNonVolatile(v2s16 chunkpos)
        {
+               if(m_chunksize == 0)
+                       return true;
+               
                /*for(s16 x=-1; x<=1; x++)
                for(s16 y=-1; y<=1; y++)*/
                s16 x=0;
@@ -392,7 +401,39 @@ class ServerMap : public Map
                }
                return true;
        }
+       
+       /*
+               Returns true if any chunk is marked as modified
+       */
+       bool anyChunkModified()
+       {
+               for(core::map<v2s16, MapChunk*>::Iterator
+                               i = m_chunks.getIterator();
+                               i.atEnd()==false; i++)
+               {
+                       v2s16 p = i.getNode()->getKey();
+                       MapChunk *chunk = i.getNode()->getValue();
+                       if(chunk->isModified())
+                               return true;
+               }
+               return false;
+       }
 
+       void setChunksNonModified()
+       {
+               for(core::map<v2s16, MapChunk*>::Iterator
+                               i = m_chunks.getIterator();
+                               i.atEnd()==false; i++)
+               {
+                       v2s16 p = i.getNode()->getKey();
+                       MapChunk *chunk = i.getNode()->getValue();
+                       chunk->setModified(false);
+               }
+       }
+
+       /*
+               Chunks are generated by using these and makeChunk().
+       */
        void initChunkMake(ChunkMakeData &data, v2s16 chunkpos);
        MapChunk* finishChunkMake(ChunkMakeData &data,
                        core::map<v3s16, MapBlock*> &changed_blocks);
@@ -402,16 +443,16 @@ class ServerMap : public Map
 
                All chunks touching this one can be altered also.
        */
-       MapChunk* generateChunkRaw(v2s16 chunkpos,
+       /*MapChunk* generateChunkRaw(v2s16 chunkpos,
                        core::map<v3s16, MapBlock*> &changed_blocks,
-                       bool force=false);
+                       bool force=false);*/
        
        /*
                Generate a chunk and its neighbors so that it won't be touched
                anymore.
        */
-       MapChunk* generateChunk(v2s16 chunkpos,
-                       core::map<v3s16, MapBlock*> &changed_blocks);
+       /*MapChunk* generateChunk(v2s16 chunkpos,
+                       core::map<v3s16, MapBlock*> &changed_blocks);*/
        
        /*
                Generate a sector.
@@ -434,14 +475,14 @@ class ServerMap : public Map
                - Check disk (loads blocks also)
                - Generate chunk
        */
-       MapSector * emergeSector(v2s16 p,
-                       core::map<v3s16, MapBlock*> &changed_blocks);
+       /*MapSector * emergeSector(v2s16 p,
+                       core::map<v3s16, MapBlock*> &changed_blocks);*/
        
-       MapSector * emergeSector(v2s16 p)
+       /*MapSector * emergeSector(v2s16 p)
        {
                core::map<v3s16, MapBlock*> changed_blocks;
                return emergeSector(p, changed_blocks);
-       }
+       }*/
 
        MapBlock * generateBlock(
                        v3s16 p,
@@ -516,7 +557,7 @@ class ServerMap : public Map
        v3s16 getBlockPos(std::string sectordir, std::string blockfile);
 
        void save(bool only_changed);
-       void loadAll();
+       //void loadAll();
        
        // Saves map seed and possibly other stuff
        void saveMapMeta();
@@ -557,9 +598,16 @@ class ServerMap : public Map
        bool m_map_saving_enabled;
 
        // Chunk size in MapSectors
+       // If 0, chunks are disabled.
        s16 m_chunksize;
        // Chunks
        core::map<v2s16, MapChunk*> m_chunks;
+
+       /*
+               Metadata is re-written on disk only if this is true.
+               This is reset to false when written on disk.
+       */
+       bool m_map_metadata_changed;
 };
 
 /*
@@ -754,6 +802,7 @@ class ManualMapVoxelManipulator : public MapVoxelManipulator
 
 struct ChunkMakeData
 {
+       bool no_op;
        ManualMapVoxelManipulator vmanip;
        u64 seed;
        v2s16 chunkpos;
@@ -764,9 +813,12 @@ struct ChunkMakeData
        v2s16 sectorpos_bigbase;
        s16 sectorpos_bigbase_size;
        s16 max_spread_amount;
+       UniqueQueue<v3s16> transforming_liquid;
 
        ChunkMakeData():
-               vmanip(NULL)
+               no_op(false),
+               vmanip(NULL),
+               seed(0)
        {}
 };