BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix the serialization error by ff73c7a (#5964)

Browse Source
This commit is contained in:
Rui 2017-06-12 04:20:50 +09:00 committed by Loïc Blot
parent 65819f3b9f
commit 683ab3a154
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/networkprotocol.h
View File

@ -158,10 +158,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
PROTOCOL VERSION 33: PROTOCOL VERSION 33:
Add TOCLIENT_UPDATE_PLAYER_LIST and send the player list to the client, Add TOCLIENT_UPDATE_PLAYER_LIST and send the player list to the client,
instead of guessing based on the active object list. instead of guessing based on the active object list.
PROTOCOL VERSION 34:
Add sound pitch
*/ */
#define LATEST_PROTOCOL_VERSION 33 #define LATEST_PROTOCOL_VERSION 34
// Server's supported network protocol range // Server's supported network protocol range
#define SERVER_PROTOCOL_VERSION_MIN 24 #define SERVER_PROTOCOL_VERSION_MIN 24

49
src/nodedef.cpp
View File

@ -248,16 +248,20 @@ void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, con
*/ */
static void serializeSimpleSoundSpec(const SimpleSoundSpec &ss, static void serializeSimpleSoundSpec(const SimpleSoundSpec &ss,
std::ostream &os) std::ostream &os, u8 version)
{ {
os<<serializeString(ss.name); os<<serializeString(ss.name);
writeF1000(os, ss.gain); writeF1000(os, ss.gain);
if (version >= 11)
writeF1000(os, ss.pitch); writeF1000(os, ss.pitch);
} }
static void deSerializeSimpleSoundSpec(SimpleSoundSpec &ss, std::istream &is) static void deSerializeSimpleSoundSpec(SimpleSoundSpec &ss, std::istream &is, u8 version)
{ {
ss.name = deSerializeString(is); ss.name = deSerializeString(is);
ss.gain = readF1000(is); ss.gain = readF1000(is);
if (version >= 11)
ss.pitch = readF1000(is); ss.pitch = readF1000(is);
} }
@ -386,7 +390,8 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
} }
// version // version
writeU8(os, 10); u8 version = (protocol_version >= 34) ? 11 : 10;
writeU8(os, version);
// general // general
os << serializeString(name); os << serializeString(name);
@ -462,9 +467,9 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
collision_box.serialize(os, protocol_version); collision_box.serialize(os, protocol_version);
// sound // sound
serializeSimpleSoundSpec(sound_footstep, os); serializeSimpleSoundSpec(sound_footstep, os, version);
serializeSimpleSoundSpec(sound_dig, os); serializeSimpleSoundSpec(sound_dig, os, version);
serializeSimpleSoundSpec(sound_dug, os); serializeSimpleSoundSpec(sound_dug, os, version);
// legacy // legacy
writeU8(os, legacy_facedir_simple); writeU8(os, legacy_facedir_simple);
@ -493,7 +498,7 @@ void ContentFeatures::deSerialize(std::istream &is)
if (version < 9) { if (version < 9) {
deSerializeOld(is, version); deSerializeOld(is, version);
return; return;
} else if (version > 10) { } else if (version > 11) {
throw SerializationError("unsupported ContentFeatures version"); throw SerializationError("unsupported ContentFeatures version");
} }
@ -575,9 +580,9 @@ void ContentFeatures::deSerialize(std::istream &is)
collision_box.deSerialize(is); collision_box.deSerialize(is);
// sounds // sounds
deSerializeSimpleSoundSpec(sound_footstep, is); deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is); deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is); deSerializeSimpleSoundSpec(sound_dug, is, version);
// read legacy properties // read legacy properties
legacy_facedir_simple = readU8(is); legacy_facedir_simple = readU8(is);
@ -1606,9 +1611,9 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
selection_box.serialize(os, protocol_version); selection_box.serialize(os, protocol_version);
writeU8(os, legacy_facedir_simple); writeU8(os, legacy_facedir_simple);
writeU8(os, legacy_wallmounted); writeU8(os, legacy_wallmounted);
serializeSimpleSoundSpec(sound_footstep, os); serializeSimpleSoundSpec(sound_footstep, os, 10);
serializeSimpleSoundSpec(sound_dig, os); serializeSimpleSoundSpec(sound_dig, os, 10);
serializeSimpleSoundSpec(sound_dug, os); serializeSimpleSoundSpec(sound_dug, os, 10);
writeU8(os, rightclickable); writeU8(os, rightclickable);
writeU8(os, drowning); writeU8(os, drowning);
writeU8(os, leveled); writeU8(os, leveled);
@ -1678,9 +1683,9 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
selection_box.deSerialize(is); selection_box.deSerialize(is);
legacy_facedir_simple = readU8(is); legacy_facedir_simple = readU8(is);
legacy_wallmounted = readU8(is); legacy_wallmounted = readU8(is);
deSerializeSimpleSoundSpec(sound_footstep, is); deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is); deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is); deSerializeSimpleSoundSpec(sound_dug, is, version);
} else if (version == 6) { } else if (version == 6) {
name = deSerializeString(is); name = deSerializeString(is);
groups.clear(); groups.clear();
@ -1728,9 +1733,9 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
selection_box.deSerialize(is); selection_box.deSerialize(is);
legacy_facedir_simple = readU8(is); legacy_facedir_simple = readU8(is);
legacy_wallmounted = readU8(is); legacy_wallmounted = readU8(is);
deSerializeSimpleSoundSpec(sound_footstep, is); deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is); deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is); deSerializeSimpleSoundSpec(sound_dug, is, version);
rightclickable = readU8(is); rightclickable = readU8(is);
drowning = readU8(is); drowning = readU8(is);
leveled = readU8(is); leveled = readU8(is);
@ -1783,9 +1788,9 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
selection_box.deSerialize(is); selection_box.deSerialize(is);
legacy_facedir_simple = readU8(is); legacy_facedir_simple = readU8(is);
legacy_wallmounted = readU8(is); legacy_wallmounted = readU8(is);
deSerializeSimpleSoundSpec(sound_footstep, is); deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is); deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is); deSerializeSimpleSoundSpec(sound_dug, is, version);
rightclickable = readU8(is); rightclickable = readU8(is);
drowning = readU8(is); drowning = readU8(is);
leveled = readU8(is); leveled = readU8(is);