class MapBlock;
class NodeMetadata;
class IGameDef;
-class IRollbackReportSink;
+class IRollbackManager;
class EmergeManager;
class ServerEnvironment;
struct BlockMakeData;
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,
// 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
void transforming_liquid_add(v3s16 p);
s32 transforming_liquid_size();
- virtual s16 getHeat(v3s16 p);
- virtual s16 getHumidity(v3s16 p);
-
protected:
friend class LuaVoxelManip;
// 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;
};
/*
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);
// 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);
u64 getSeed();
s16 getWaterLevel();
- virtual s16 updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
- virtual s16 updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
-
private:
// Emerge manager
EmergeManager *m_emerge;
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 blitBack(std::map<v3s16, MapBlock*> & modified_blocks);
-
-protected:
- Map *m_map;
- /*
- key = blockpos
- value = flags describing the block
- */
- 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,
- 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);
+ void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks,
+ bool overwrite_generated = true);
+
+ bool m_is_dirty;
protected:
bool m_create_area;
+ Map *m_map;
+ /*
+ key = blockpos
+ value = flags describing the block
+ */
+ std::map<v3s16, u8> m_loaded_blocks;
};
#endif
-