Tune caves
[oweals/minetest.git] / src / map.h
index 5bea4a137c054dde6ef739732a048b95c1a978de..b71f699c04ebc7ac4141bab702f28cbaadefa118 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -28,19 +28,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "mapnode.h"
-#include "mapblock_nodemod.h"
 #include "constants.h"
 #include "voxel.h"
+#include "utility.h" // Needed for UniqueQueue, a member of Map
+#include "modifiedstate.h"
 
 extern "C" {
        #include "sqlite3.h"
 }
 
+class ClientMap;
 class MapSector;
 class ServerMapSector;
-class ClientMapSector;
 class MapBlock;
 class NodeMetadata;
+class IGameDef;
 
 namespace mapgen{
        struct BlockMakeData;
@@ -109,7 +111,7 @@ class Map /*: public NodeContainer*/
 {
 public:
 
-       Map(std::ostream &dout);
+       Map(std::ostream &dout, IGameDef *gamedef);
        virtual ~Map();
 
        /*virtual u16 nodeContainerId() const
@@ -157,6 +159,10 @@ public:
        // Returns NULL if not found
        MapBlock * getBlockNoCreateNoEx(v3s16 p);
        
+       /* Server overrides */
+       virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true)
+       { return getBlockNoCreateNoEx(p); }
+
        // Returns InvalidPositionException if not found
        bool isNodeUnderground(v3s16 p);
        
@@ -230,7 +236,7 @@ public:
        virtual void beginSave() {return;};
        virtual void endSave() {return;};
        
-       virtual void save(bool only_changed){assert(0);};
+       virtual void save(ModifiedState save_level){assert(0);};
        
        // Server implements this.
        // Client leaves it as no-op.
@@ -285,7 +291,9 @@ public:
        
 protected:
 
-       std::ostream &m_dout;
+       std::ostream &m_dout; // A bit deprecated, could be removed
+
+       IGameDef *m_gamedef;
 
        core::map<MapEventReceiver*, bool> m_event_receivers;
        
@@ -311,7 +319,7 @@ public:
        /*
                savedir: directory to which map data should be saved
        */
-       ServerMap(std::string savedir);
+       ServerMap(std::string savedir, IGameDef *gamedef);
        ~ServerMap();
 
        s32 mapType() const
@@ -379,6 +387,7 @@ public:
        void verifyDatabase();
        // Get an integer suitable for a block
        static sqlite3_int64 getBlockAsInteger(const v3s16 pos);
+       static v3s16 getIntegerAsBlock(sqlite3_int64 i);
 
        // Returns true if the database file does not exist
        bool loadFromFolders();
@@ -387,9 +396,11 @@ public:
        void beginSave();
        void endSave();
 
-       void save(bool only_changed);
+       void save(ModifiedState save_level);
        //void loadAll();
        
+       void listAllLoadableBlocks(core::list<v3s16> &dst);
+       
        // Saves map seed and possibly other stuff
        void saveMapMeta();
        void loadMapMeta();
@@ -428,9 +439,9 @@ public:
        u64 getSeed(){ return m_seed; }
 
 private:
-       // Seed used for all kinds of randomness
+       // Seed used for all kinds of randomness in generation
        u64 m_seed;
-
+       
        std::string m_savedir;
        bool m_map_saving_enabled;
 
@@ -454,162 +465,9 @@ private:
        sqlite3 *m_database;
        sqlite3_stmt *m_database_read;
        sqlite3_stmt *m_database_write;
+       sqlite3_stmt *m_database_list;
 };
 
-/*
-       ClientMap stuff
-*/
-
-#ifndef SERVER
-
-struct MapDrawControl
-{
-       MapDrawControl():
-               range_all(false),
-               wanted_range(50),
-               wanted_max_blocks(0),
-               wanted_min_range(0),
-               blocks_drawn(0),
-               blocks_would_have_drawn(0)
-       {
-       }
-       // Overrides limits by drawing everything
-       bool range_all;
-       // Wanted drawing range
-       float wanted_range;
-       // Maximum number of blocks to draw
-       u32 wanted_max_blocks;
-       // Blocks in this range are drawn regardless of number of blocks drawn
-       float wanted_min_range;
-       // Number of blocks rendered is written here by the renderer
-       u32 blocks_drawn;
-       // Number of blocks that would have been drawn in wanted_range
-       u32 blocks_would_have_drawn;
-};
-
-class Client;
-
-/*
-       ClientMap
-       
-       This is the only map class that is able to render itself on screen.
-*/
-
-class ClientMap : public Map, public scene::ISceneNode
-{
-public:
-       ClientMap(
-                       Client *client,
-                       MapDrawControl &control,
-                       scene::ISceneNode* parent,
-                       scene::ISceneManager* mgr,
-                       s32 id
-       );
-
-       ~ClientMap();
-
-       s32 mapType() const
-       {
-               return MAPTYPE_CLIENT;
-       }
-
-       void drop()
-       {
-               ISceneNode::drop();
-       }
-
-       void updateCamera(v3f pos, v3f dir)
-       {
-               JMutexAutoLock lock(m_camera_mutex);
-               m_camera_position = pos;
-               m_camera_direction = dir;
-       }
-
-       /*
-               Forcefully get a sector from somewhere
-       */
-       MapSector * emergeSector(v2s16 p);
-
-       //void deSerializeSector(v2s16 p2d, std::istream &is);
-
-       /*
-               ISceneNode methods
-       */
-
-       virtual void OnRegisterSceneNode();
-
-       virtual void render()
-       {
-               video::IVideoDriver* driver = SceneManager->getVideoDriver();
-               driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-               renderMap(driver, SceneManager->getSceneNodeRenderPass());
-       }
-       
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
-       {
-               return m_box;
-       }
-
-       void renderMap(video::IVideoDriver* driver, s32 pass);
-
-       void renderPostFx();
-
-       /*
-               Methods for setting temporary modifications to nodes for
-               drawing.
-
-               Returns true if something changed.
-               
-               All blocks whose mesh could have been changed are inserted
-               to affected_blocks.
-       */
-       bool setTempMod(v3s16 p, NodeMod mod,
-                       core::map<v3s16, MapBlock*> *affected_blocks=NULL);
-       bool clearTempMod(v3s16 p,
-                       core::map<v3s16, MapBlock*> *affected_blocks=NULL);
-       // Efficient implementation needs a cache of TempMods
-       //void clearTempMods();
-
-       void expireMeshes(bool only_daynight_diffed);
-       
-       /*
-               Update the faces of the given block and blocks on the
-               leading edge.
-       */
-       void updateMeshes(v3s16 blockpos, u32 daynight_ratio);
-       
-       // Update meshes that touch the node
-       //void updateNodeMeshes(v3s16 nodepos, u32 daynight_ratio);
-
-       // For debug printing
-       virtual void PrintInfo(std::ostream &out);
-       
-       // Check if sector was drawn on last render()
-       bool sectorWasDrawn(v2s16 p)
-       {
-               return (m_last_drawn_sectors.find(p) != NULL);
-       }
-       
-private:
-       Client *m_client;
-       
-       core::aabbox3d<f32> m_box;
-       
-       // This is the master heightmap mesh
-       //scene::SMesh *mesh;
-       //JMutex mesh_mutex;
-       
-       MapDrawControl &m_control;
-
-       v3f m_camera_position;
-       v3f m_camera_direction;
-       JMutex m_camera_mutex;
-       
-       core::map<v2s16, bool> m_last_drawn_sectors;
-};
-
-#endif
-
 class MapVoxelManipulator : public VoxelManipulator
 {
 public: