Fix two reconnect bugs

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index c650e51b65090c7defd7febfccf12ad491b6c0cd..78614d2285f3310263ca5bf2813c56e9f0b6bd0c 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/container.h"
 #include "nodetimer.h"
 
+class Settings;
 class Database;
 class ClientMap;
 class MapSector;
@@ -80,9 +81,9 @@ struct MapEditEvent
 
        MapEditEvent():
                type(MEET_OTHER),
+               n(CONTENT_AIR),
                already_known_by_peer(0)
-       {
-       }
+       { }
 
        MapEditEvent * clone()
        {
@@ -189,7 +190,7 @@ class Map /*: public NodeContainer*/
        MapBlock * getBlockNoCreateNoEx(v3s16 p);
 
        /* Server overrides */
-       virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true)
+       virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true)
        { return getBlockNoCreateNoEx(p); }
 
        // Returns InvalidPositionException if not found
@@ -262,42 +263,33 @@ class Map /*: public NodeContainer*/
        //bool updateChangedVisibleArea();
 
        // Call these before and after saving of many blocks
-       virtual void beginSave() {return;};
-       virtual void endSave() {return;};
+       virtual void beginSave() { return; }
+       virtual void endSave() { return; }
 
-       virtual void save(ModifiedState save_level){assert(0);};
+       virtual void save(ModifiedState save_level) { FATAL_ERROR("FIXME"); }
 
-       // Server implements this.
-       // Client leaves it as no-op.
-       virtual bool saveBlock(MapBlock *block) { return false; };
+       // Server implements these.
+       // Client leaves them as no-op.
+       virtual bool saveBlock(MapBlock *block) { return false; }
+       virtual bool deleteBlock(v3s16 blockpos) { return false; }
 
        /*
                Updates usage timers and unloads unused blocks and sectors.
                Saves modified blocks before unloading on MAPTYPE_SERVER.
        */
-       void timerUpdate(float dtime, float unload_timeout,
-                       std::list<v3s16> *unloaded_blocks=NULL);
+       void timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
+                       std::vector<v3s16> *unloaded_blocks=NULL);
 
        /*
                Unloads all blocks with a zero refCount().
                Saves modified blocks before unloading on MAPTYPE_SERVER.
        */
-       void unloadUnreferencedBlocks(std::list<v3s16> *unloaded_blocks=NULL);
+       void unloadUnreferencedBlocks(std::vector<v3s16> *unloaded_blocks=NULL);
 
        // Deletes sectors and their blocks from memory
        // Takes cache into account
        // If deleted sector is in sector cache, clears cache
-       void deleteSectors(std::list<v2s16> &list);
-
-#if 0
-       /*
-               Unload unused data
-               = flush changed to disk and delete from memory, if usage timer of
-                 block is more than timeout
-       */
-       void unloadUnusedData(float timeout,
-                       core::list<v3s16> *deleted_blocks=NULL);
-#endif
+       void deleteSectors(std::vector<v2s16> &list);
 
        // For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: "
        virtual void PrintInfo(std::ostream &out);
@@ -309,7 +301,8 @@ class Map /*: public NodeContainer*/
                These are basically coordinate wrappers to MapBlock
        */
 
-       NodeMetadata* getNodeMetadata(v3s16 p);
+       std::vector<v3s16> findNodesWithMetadata(v3s16 p1, v3s16 p2);
+       NodeMetadata *getNodeMetadata(v3s16 p);
 
        /**
         * Sets metadata for a node.
@@ -366,6 +359,14 @@ class Map /*: public NodeContainer*/
 
        // Queued transforming water nodes
        UniqueQueue<v3s16> m_transforming_liquid;
+
+private:
+       f32 m_transforming_liquid_loop_count_multiplier;
+       u32 m_unprocessed_count;
+       u32 m_inc_trending_up_start_time; // milliseconds
+       bool m_queue_size_timer_started;
+
+       DISABLE_CLASS_COPY(Map);
 };
 
 /*
@@ -394,21 +395,21 @@ class ServerMap : public Map
                - Check disk (doesn't load blocks)
                - Create blank one
        */
-       ServerMapSector * createSector(v2s16 p);
+       ServerMapSector *createSector(v2s16 p);
 
        /*
                Blocks are generated by using these and makeBlock().
        */
-       bool initBlockMake(BlockMakeData *data, v3s16 blockpos);
+       bool initBlockMake(v3s16 blockpos, BlockMakeData *data);
        void finishBlockMake(BlockMakeData *data,
-                       std::map<v3s16, MapBlock*> &changed_blocks);
+               std::map<v3s16, MapBlock*> *changed_blocks);
 
        /*
                Get a block from somewhere.
                - Memory
                - Create blank
        */
-       MapBlock * createBlock(v3s16 p);
+       MapBlock *createBlock(v3s16 p);
 
        /*
                Forcefully get a block from somewhere.
@@ -417,7 +418,7 @@ class ServerMap : public Map
                - Create blank filled with CONTENT_IGNORE
 
        */
-       MapBlock * emergeBlock(v3s16 p, bool create_blank=true);
+       MapBlock *emergeBlock(v3s16 p, bool create_blank=true);
 
        /*
                Try to get a block.
@@ -448,6 +449,7 @@ class ServerMap : public Map
        /*
                Database functions
        */
+       static Database *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
        // Verify we can read/write to the database
        void verifyDatabase();
 
@@ -459,8 +461,8 @@ class ServerMap : public Map
        void endSave();
 
        void save(ModifiedState save_level);
-       void listAllLoadableBlocks(std::list<v3s16> &dst);
-       void listAllLoadedBlocks(std::list<v3s16> &dst);
+       void listAllLoadableBlocks(std::vector<v3s16> &dst);
+       void listAllLoadedBlocks(std::vector<v3s16> &dst);
        // Saves map seed and possibly other stuff
        void saveMapMeta();
        void loadMapMeta();
@@ -484,14 +486,16 @@ class ServerMap : public Map
        // Returns true if sector now resides in memory
        //bool deFlushSector(v2s16 p2d);
 
-       bool saveBlock(MapBlock *block, Database *db);
        bool saveBlock(MapBlock *block);
+       static bool saveBlock(MapBlock *block, Database *db);
        // This will generate a sector with getSector if not found.
        void loadBlock(std::string sectordir, std::string blockfile, MapSector *sector, bool save_after_load=false);
        MapBlock* loadBlock(v3s16 p);
        // Database version
        void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
 
+       bool deleteBlock(v3s16 blockpos);
+
        void updateVManip(v3s16 pos);
 
        // For debug printing
@@ -529,11 +533,11 @@ class ServerMap : public Map
 #define VMANIP_BLOCK_DATA_INEXIST     1
 #define VMANIP_BLOCK_CONTAINS_CIGNORE 2
 
-class ManualMapVoxelManipulator : public VoxelManipulator
+class MMVManip : public VoxelManipulator
 {
 public:
-       ManualMapVoxelManipulator(Map *map);
-       virtual ~ManualMapVoxelManipulator();
+       MMVManip(Map *map);
+       virtual ~MMVManip();
 
        virtual void clear()
        {
@@ -545,11 +549,11 @@ class ManualMapVoxelManipulator : public VoxelManipulator
        {m_map = map;}
 
        void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
-                       bool load_if_inexistent = true);
+               bool load_if_inexistent = true);
 
        // This is much faster with big chunks of generated data
        void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks,
-                       bool overwrite_generated = true);
+               bool overwrite_generated = true);
 
        bool m_is_dirty;