diff options
author | Dániel Juhász <juhdanad@gmail.com> | 2018-02-10 22:04:16 +0200 |
---|---|---|
committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-02-10 21:04:16 +0100 |
commit | 3face01a202040e4feff3b0936b4aa89c051c98d (patch) | |
tree | ccdad6773aa9705cc07fdc9f71f28bae395f353e /src/mapblock.cpp | |
parent | 617d94c8038e3ff035eaeef7ccdfa4f442feb873 (diff) | |
download | minetest-3face01a202040e4feff3b0936b4aa89c051c98d.tar.gz minetest-3face01a202040e4feff3b0936b4aa89c051c98d.tar.bz2 minetest-3face01a202040e4feff3b0936b4aa89c051c98d.zip |
Node definition manager refactor (#7016)
* Rename IWritableNodeDefManager to NodeDefManager
* Make INodeDefManager functions const
* Use "const *NodeDefManager" instead of "*INodeDefManager"
* Remove unused INodeDefManager class
* Merge NodeDefManager and CNodeDefManager
* Document NodeDefManager
Diffstat (limited to 'src/mapblock.cpp')
-rw-r--r-- | src/mapblock.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index ad98373f2..54cb2df0e 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -132,6 +132,7 @@ std::string MapBlock::getModifiedReasonString() return reason; } + void MapBlock::copyTo(VoxelManipulator &dst) { v3s16 data_size(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE); @@ -154,7 +155,7 @@ void MapBlock::copyFrom(VoxelManipulator &dst) void MapBlock::actuallyUpdateDayNightDiff() { - INodeDefManager *nodemgr = m_gamedef->ndef(); + const NodeDefManager *nodemgr = m_gamedef->ndef(); // Running this function un-expires m_day_night_differs m_day_night_differs_expired = false; @@ -252,7 +253,7 @@ s16 MapBlock::getGroundLevel(v2s16 p2d) // mapblocks. static content_t getBlockNodeIdMapping_mapping[USHRT_MAX + 1]; static void getBlockNodeIdMapping(NameIdMapping *nimap, MapNode *nodes, - INodeDefManager *nodedef) + const NodeDefManager *nodedef) { memset(getBlockNodeIdMapping_mapping, 0xFF, (USHRT_MAX + 1) * sizeof(content_t)); @@ -294,7 +295,7 @@ static void getBlockNodeIdMapping(NameIdMapping *nimap, MapNode *nodes, static void correctBlockNodeIds(const NameIdMapping *nimap, MapNode *nodes, IGameDef *gamedef) { - INodeDefManager *nodedef = gamedef->ndef(); + const NodeDefManager *nodedef = gamedef->ndef(); // This means the block contains incorrect ids, and we contain // the information to convert those to names. // nodedef contains information to convert our names to globally @@ -741,7 +742,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk) // Legacy data changes // This code has to convert from pre-22 to post-22 format. - INodeDefManager *nodedef = m_gamedef->ndef(); + const NodeDefManager *nodedef = m_gamedef->ndef(); for(u32 i=0; i<nodecount; i++) { const ContentFeatures &f = nodedef->get(data[i].getContent()); |