diff options
| author | Thomas--S <Thomas--S@users.noreply.github.com> | 2017-06-04 21:42:32 +0200 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2017-06-04 21:42:32 +0200 |
| commit | 599e13e95e81aadb959c9f3715aec9b425ede084 (patch) | |
| tree | 1cb10b680945d2f4e28c53df111bfbc680a77661 /src/mapblock.cpp | |
| parent | a98baef5e4fedca36c8c8755ad7c8233469f6a3f (diff) | |
| download | minetest-599e13e95e81aadb959c9f3715aec9b425ede084.tar.gz minetest-599e13e95e81aadb959c9f3715aec9b425ede084.tar.bz2 minetest-599e13e95e81aadb959c9f3715aec9b425ede084.zip | |
Remove deprecated code segments (#5891)
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index ec10a49bb..07912b9a2 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "gamedef.h" #include "log.h" #include "nameidmapping.h" -#include "content_mapnode.h" // For legacy name-id mapping #include "content_nodemeta.h" // For legacy deserialization #include "serialization.h" #ifndef SERVER @@ -931,12 +930,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk) // Dynamically re-set ids based on node names NameIdMapping nimap; // If supported, read node definition id mapping - if (version >= 21) { - nimap.deSerialize(is); - // Else set the legacy mapping - } else { - content_mapnode_get_name_id_mapping(&nimap); - } + nimap.deSerialize(is); correctBlockNodeIds(&nimap, data, m_gamedef); } |