diff options
author | sapier <Sapier at GMX dot net> | 2014-06-09 14:25:35 +0200 |
---|---|---|
committer | sapier <Sapier at GMX dot net> | 2014-06-23 00:13:41 +0200 |
commit | b3a2ef1a911b5ee22ff6478b5a3f9a12f6e40121 (patch) | |
tree | b97d26bac23a4659f043b7178d67f5b649def6cb /src/map.h | |
parent | 8ad83767cfccc2d1a42bdc4af087ec013d7554a0 (diff) | |
download | minetest-b3a2ef1a911b5ee22ff6478b5a3f9a12f6e40121.tar.gz minetest-b3a2ef1a911b5ee22ff6478b5a3f9a12f6e40121.tar.bz2 minetest-b3a2ef1a911b5ee22ff6478b5a3f9a12f6e40121.zip |
Remove MapVoxelManipulator not really used by anyone
Diffstat (limited to 'src/map.h')
-rw-r--r-- | src/map.h | 34 |
1 files changed, 10 insertions, 24 deletions
@@ -523,14 +523,15 @@ private: 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() { @@ -538,30 +539,9 @@ public: 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); @@ -570,6 +550,12 @@ public: protected: bool m_create_area; + Map *m_map; + /* + key = blockpos + value = flags describing the block + */ + std::map<v3s16, u8> m_loaded_blocks; }; #endif |