#ifndef MAP_HEADER
#define MAP_HEADER
-#include <jmutex.h>
-#include <jmutexautolock.h>
-#include <jthread.h>
#include <iostream>
#include <sstream>
#include <set>
#include "mapnode.h"
#include "constants.h"
#include "voxel.h"
-#include "mapgen.h" //for BlockMakeData and EmergeManager
#include "modifiedstate.h"
#include "util/container.h"
#include "nodetimer.h"
-extern "C" {
- #include "sqlite3.h"
-}
-
+class Database;
class ClientMap;
class MapSector;
class ServerMapSector;
class MapBlock;
class NodeMetadata;
class IGameDef;
-class IRollbackReportSink;
+class IRollbackManager;
class EmergeManager;
+class ServerEnvironment;
struct BlockMakeData;
+struct MapgenParams;
/*
MEET_ADDNODE,
// Node removed (changed to air)
MEET_REMOVENODE,
+ // Node swapped (changed without metadata change)
+ MEET_SWAPNODE,
// Node metadata of block changed (not knowing which node exactly)
// p stores block coordinate
MEET_BLOCK_NODE_METADATA_CHANGED,
return VoxelArea(p);
case MEET_REMOVENODE:
return VoxelArea(p);
+ case MEET_SWAPNODE:
+ return VoxelArea(p);
case MEET_BLOCK_NODE_METADATA_CHANGED:
{
v3s16 np1 = p*MAP_BLOCKSIZE;
bool isValidPosition(v3s16 p);
- // throws InvalidPositionException if not found
- MapNode getNode(v3s16 p);
-
// throws InvalidPositionException if not found
void setNode(v3s16 p, MapNode & n);
// Returns a CONTENT_IGNORE node if not found
- MapNode getNodeNoEx(v3s16 p);
+ // If is_valid_position is not NULL then this will be set to true if the
+ // position is valid, otherwise false
+ MapNode getNodeNoEx(v3s16 p, bool *is_valid_position = NULL);
void unspreadLight(enum LightBank bank,
std::map<v3s16, u8> & from_nodes,
These handle lighting but not faces.
*/
void addNodeAndUpdate(v3s16 p, MapNode n,
- std::map<v3s16, MapBlock*> &modified_blocks);
+ std::map<v3s16, MapBlock*> &modified_blocks,
+ bool remove_metadata = true);
void removeNodeAndUpdate(v3s16 p,
std::map<v3s16, MapBlock*> &modified_blocks);
These emit events.
Return true if succeeded, false if not.
*/
- bool addNodeWithEvent(v3s16 p, MapNode n);
+ bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true);
bool removeNodeWithEvent(v3s16 p);
/*
// Server implements this.
// Client leaves it as no-op.
- virtual void saveBlock(MapBlock *block){};
+ virtual bool saveBlock(MapBlock *block) { return false; };
/*
Updates usage timers and unloads unused blocks and sectors.
virtual void PrintInfo(std::ostream &out);
void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks);
- void transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks);
/*
Node metadata
*/
NodeMetadata* getNodeMetadata(v3s16 p);
- void setNodeMetadata(v3s16 p, NodeMetadata *meta);
+
+ /**
+ * Sets metadata for a node.
+ * This method sets the metadata for a given node.
+ * On success, it returns @c true and the object pointed to
+ * by @p meta is then managed by the system and should
+ * not be deleted by the caller.
+ *
+ * In case of failure, the method returns @c false and the
+ * caller is still responsible for deleting the object!
+ *
+ * @param p node coordinates
+ * @param meta pointer to @c NodeMetadata object
+ * @return @c true on success, false on failure
+ */
+ bool setNodeMetadata(v3s16 p, NodeMetadata *meta);
void removeNodeMetadata(v3s16 p);
/*
s32 transforming_liquid_size();
protected:
+ friend class LuaVoxelManip;
std::ostream &m_dout; // A bit deprecated, could be removed
Blocks are generated by using these and makeBlock().
*/
bool initBlockMake(BlockMakeData *data, v3s16 blockpos);
- MapBlock *finishBlockMake(BlockMakeData *data,
+ void finishBlockMake(BlockMakeData *data,
std::map<v3s16, MapBlock*> &changed_blocks);
/*
*/
MapBlock * emergeBlock(v3s16 p, bool create_blank=true);
+ /*
+ Try to get a block.
+ If it does not exist in memory, add it to the emerge queue.
+ - Memory
+ - Emerge Queue (deferred disk or generate)
+ */
+ MapBlock *getBlockOrEmerge(v3s16 p3d);
+
+ // Carries out any initialization necessary before block is sent
+ void prepareBlock(MapBlock *block);
+
// Helper for placing objects on ground level
s16 findGroundLevel(v2s16 p2d);
/*
Database functions
*/
- // Create the database structure
- void createDatabase();
// Verify we can read/write to the database
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();
// Returns true if sector now resides in memory
//bool deFlushSector(v2s16 p2d);
- void saveBlock(MapBlock *block);
+ bool saveBlock(MapBlock *block, Database *db);
+ bool saveBlock(MapBlock *block);
// 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);
+ void updateVManip(v3s16 pos);
+
// For debug printing
virtual void PrintInfo(std::ostream &out);
bool isSavingEnabled(){ return m_map_saving_enabled; }
- u64 getSeed(){ return m_seed; }
-
- MapgenParams *getMapgenParams(){ return m_mgparams; }
+ u64 getSeed();
+ s16 getWaterLevel();
- // Parameters fed to the Mapgen
- MapgenParams *m_mgparams;
private:
- // Seed used for all kinds of randomness in generation
- u64 m_seed;
-
// Emerge manager
EmergeManager *m_emerge;
This is reset to false when written on disk.
*/
bool m_map_metadata_changed;
-
- /*
- SQLite database and statements
- */
- sqlite3 *m_database;
- sqlite3_stmt *m_database_read;
- sqlite3_stmt *m_database_write;
- sqlite3_stmt *m_database_list;
+ Database *dbase;
};
+
#define VMANIP_BLOCK_DATA_INEXIST 1
#define VMANIP_BLOCK_CONTAINS_CIGNORE 2
-class MapVoxelManipulator : public VoxelManipulator
+class ManualMapVoxelManipulator : public VoxelManipulator
{
public:
- MapVoxelManipulator(Map *map);
- virtual ~MapVoxelManipulator();
+ ManualMapVoxelManipulator(Map *map);
+ virtual ~ManualMapVoxelManipulator();
virtual void clear()
{
m_loaded_blocks.clear();
}
- virtual void emerge(VoxelArea a, s32 caller_id=-1);
+ void setMap(Map *map)
+ {m_map = map;}
+
+ void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
+ 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);
- void blitBack(std::map<v3s16, MapBlock*> & modified_blocks);
+ bool m_is_dirty;
protected:
+ bool m_create_area;
Map *m_map;
/*
key = blockpos
std::map<v3s16, u8> m_loaded_blocks;
};
-class ManualMapVoxelManipulator : public MapVoxelManipulator
-{
-public:
- ManualMapVoxelManipulator(Map *map);
- virtual ~ManualMapVoxelManipulator();
-
- void setMap(Map *map)
- {m_map = map;}
-
- virtual void emerge(VoxelArea a, s32 caller_id=-1);
-
- void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max);
-
- // This is much faster with big chunks of generated data
- void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks);
-
-protected:
- bool m_create_area;
-};
-
#endif
-
projects / minetest.git / blobdiff