#include "util/container.h"
#include "nodetimer.h"
#include "map_settings_manager.h"
+#include "debug.h"
class Settings;
class MapDatabase;
MEET_REMOVENODE,
// Node swapped (changed without metadata change)
MEET_SWAPNODE,
- // Node metadata of block changed (not knowing which node exactly)
- // p stores block coordinate
+ // Node metadata changed
MEET_BLOCK_NODE_METADATA_CHANGED,
// Anything else (modified_blocks are set unsent)
MEET_OTHER
v3s16 p;
MapNode n = CONTENT_AIR;
std::set<v3s16> modified_blocks;
- u16 already_known_by_peer = 0;
+ bool is_private_change = false;
MapEditEvent() = default;
event->p = p;
event->n = n;
event->modified_blocks = modified_blocks;
+ event->is_private_change = is_private_change;
return event;
}
their differing fetch methods.
*/
virtual MapSector * emergeSector(v2s16 p){ return NULL; }
- virtual MapSector * emergeSector(v2s16 p,
- std::map<v3s16, MapBlock*> &changed_blocks){ return NULL; }
// Returns InvalidPositionException if not found
MapBlock * getBlockNoCreate(v3s16 p);
virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true)
{ return getBlockNoCreateNoEx(p); }
- inline INodeDefManager * getNodeDefManager() { return m_nodedef; }
+ inline const NodeDefManager * getNodeDefManager() { return m_nodedef; }
// Returns InvalidPositionException if not found
bool isNodeUnderground(v3s16 p);
*/
void transforming_liquid_add(v3s16 p);
- s32 transforming_liquid_size();
bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
protected:
UniqueQueue<v3s16> m_transforming_liquid;
// This stores the properties of the nodes on the map.
- INodeDefManager *m_nodedef;
+ const NodeDefManager *m_nodedef;
bool isOccluded(v3s16 p0, v3s16 p1, float step, float stepfac,
float start_off, float end_off, u32 needed_count);
- Check disk (doesn't load blocks)
- Create blank one
*/
- ServerMapSector *createSector(v2s16 p);
-
- bool saoPositionOverLimit(const v3f &p);
+ MapSector *createSector(v2s16 p);
/*
Blocks are generated by using these and makeBlock().
Misc. helper functions for fiddling with directory and file
names when saving
*/
- void createDirs(std::string path);
+ void createDirs(const std::string &path);
// returns something like "map/sectors/xxxxxxxx"
std::string getSectorDir(v2s16 pos, int layout = 2);
// dirname: final directory name
MapgenParams *getMapgenParams();
- /*void saveChunkMeta();
- void loadChunkMeta();*/
-
- // The sector mutex should be locked when calling most of these
-
- // This only saves sector-specific data such as the heightmap
- // (no MapBlocks)
- // DEPRECATED? Sectors have no metadata anymore.
- void saveSectorMeta(ServerMapSector *sector);
- MapSector* loadSectorMeta(std::string dirname, bool save_after_load);
- bool loadSectorMeta(v2s16 p2d);
-
bool saveBlock(MapBlock *block);
static bool saveBlock(MapBlock *block, MapDatabase *db);
// This will generate a sector with getSector if not found.
*/
bool m_map_metadata_changed = true;
MapDatabase *dbase = nullptr;
+ MapDatabase *dbase_ro = nullptr;
};
{
public:
MMVManip(Map *map);
- virtual ~MMVManip();
+ virtual ~MMVManip() = default;
virtual void clear()
{