diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-01-27 00:39:33 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-01-27 00:39:33 +1000 |
| commit | ca217d041639883ffcc1c7f7856502efca1b90a4 (patch) | |
| tree | d0e3ef9aed43f445b73545fd0226a01aeaa0c12b | |
| parent | 47aca6f6d164347de950a46b11e1774445cdb9e3 (diff) | |
| download | minetest-ca217d041639883ffcc1c7f7856502efca1b90a4.tar.gz minetest-ca217d041639883ffcc1c7f7856502efca1b90a4.tar.bz2 minetest-ca217d041639883ffcc1c7f7856502efca1b90a4.zip | |
Revert "Fix a crash (assert) when client set serial version < 24 in INIT command SER_FMT_VER_LOWEST is set to zero, then the test is stupid in INIT because all client works. In mapblock we check if client's serialization version is < 24, but if client sent serialization version < 24 (15 for example) the server set it and tried to send nodes, then BOOM"
nerzhul is (may?) be working on a new solution. For the moment this is reverted because old worlds cannot be loaded (see discussion on github for the commit).
This reverts commit 800d19270250bb13cc6b2d330199815bf8e96446.
| -rw-r--r-- | src/mapblock.cpp | 6 | ||||
| -rw-r--r-- | src/serialization.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index c22096562..4cc0abc81 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -526,6 +526,12 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk) throw SerializationError("ERROR: Not writing dummy block."); } + // Can't do this anymore; we have 16-bit dynamically allocated node IDs + // in memory; conversion just won't work in this direction. + if(version < 24) + throw SerializationError("MapBlock::serialize: serialization to " + "version < 24 not possible"); + // First byte u8 flags = 0; if(is_underground) diff --git a/src/serialization.h b/src/serialization.h index 6bc4cdc53..caa1a66da 100644 --- a/src/serialization.h +++ b/src/serialization.h @@ -30,11 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc., -------------------------------- For map data (blocks, nodes, sectors). - + NOTE: The goal is to increment this so that saved maps will be loadable by any version. Other compatibility is not maintained. - + 0: original networked test with 1-byte nodes 1: update with 2-byte nodes 2: lighting is transmitted in param @@ -70,7 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // Saved on disk version #define SER_FMT_VER_HIGHEST_WRITE 25 // Lowest supported serialization version -#define SER_FMT_VER_LOWEST 24 +#define SER_FMT_VER_LOWEST 0 inline bool ser_ver_supported(s32 v) { return v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST_READ; |