#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 MapgenParams
#include "modifiedstate.h"
#include "util/container.h"
#include "nodetimer.h"
-#include "environment.h"
-
-extern "C" {
- #include "sqlite3.h"
-}
+class Database;
class ClientMap;
class MapSector;
class ServerMapSector;
class IGameDef;
class IRollbackReportSink;
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;
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);
/*
*/
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);
/*
*/
MapBlock * emergeBlock(v3s16 p, bool create_blank=true);
+
+ // Carries out any initialization necessary before block is sent
+ void prepareBlock(MapBlock *block);
// Helper for placing objects on ground level
- s16 findGroundLevel(v2s16 p2d);
+ s16 findGroundLevel(v2s16 p2d, bool cacheBlocks);
/*
Misc. helper functions for fiddling with directory and file
/*
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();
u64 getSeed(){ return m_seed; }
MapgenParams *getMapgenParams(){ return m_mgparams; }
+ void setMapgenParams(MapgenParams *mgparams){ m_mgparams = mgparams; }
// Parameters fed to the Mapgen
MapgenParams *m_mgparams;
- virtual s16 getHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
- virtual s16 getHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
+ virtual s16 updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
+ virtual s16 updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
private:
// Seed used for all kinds of randomness in generation
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