diff options
| author | SmallJoker <mk939@ymail.com> | 2020-09-20 13:12:55 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-10-01 09:52:59 +0200 |
| commit | 947466ab28129fd69e6630974c6c4e901f2bebc6 (patch) | |
| tree | 720b35a5f8c01e42a5078f7fb79d612d1a1484d9 /src/mapblock.cpp | |
| parent | ca5c2dbefab3676514e48b445b36de50993de9f1 (diff) | |
| download | minetest-947466ab28129fd69e6630974c6c4e901f2bebc6.tar.gz minetest-947466ab28129fd69e6630974c6c4e901f2bebc6.tar.bz2 minetest-947466ab28129fd69e6630974c6c4e901f2bebc6.zip | |
(se)SerializeString: Include max length in the name
This commit clarifies the maximal length of the serialized strings.
It will avoid accidental use of serializeString() when a larger string can be expected.
Removes unused Wide String serialization functions
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index 5b755b7a6..5fb6b221b 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -668,13 +668,13 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk) // Ignore errors try { if (version <= 15) { - std::string data = deSerializeString(is); + std::string data = deSerializeString16(is); std::istringstream iss(data, std::ios_base::binary); content_nodemeta_deserialize_legacy(iss, &m_node_metadata, &m_node_timers, m_gamedef->idef()); } else { - //std::string data = deSerializeLongString(is); + //std::string data = deSerializeString32(is); std::ostringstream oss(std::ios_base::binary); decompressZlib(is, oss); std::istringstream iss(oss.str(), std::ios_base::binary); |