Skip to content

Commit

Permalink
Fix the serialization error by ff73c7a (#5964)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nerzhul
Rui authored and nerzhul committed Jun 11, 2017
1 parent 65819f3 commit 683ab3a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 26 deletions.
5 changes: 3 additions & 2 deletions src/network/networkprotocol.h
View file
Expand Up @@ -158,10 +158,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
PROTOCOL VERSION 33:
Add TOCLIENT_UPDATE_PLAYER_LIST and send the player list to the client,
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
#define SERVER_PROTOCOL_VERSION_MIN 24
Expand Down
53 changes: 29 additions & 24 deletions src/nodedef.cpp
View file
Expand Up @@ -248,17 +248,21 @@ void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, con
*/

static void serializeSimpleSoundSpec(const SimpleSoundSpec &ss,
std::ostream &os)
std::ostream &os, u8 version)
{
os<<serializeString(ss.name);
writeF1000(os, ss.gain);
writeF1000(os, ss.pitch);

if (version >= 11)
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.gain = readF1000(is);
ss.pitch = readF1000(is);

if (version >= 11)
ss.pitch = readF1000(is);
}

void TextureSettings::readSettings()
Expand Down Expand Up @@ -386,7 +390,8 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
}

// version
writeU8(os, 10);
u8 version = (protocol_version >= 34) ? 11 : 10;
writeU8(os, version);

// general
os << serializeString(name);
Expand Down Expand Up @@ -462,9 +467,9 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
collision_box.serialize(os, protocol_version);

// sound
serializeSimpleSoundSpec(sound_footstep, os);
serializeSimpleSoundSpec(sound_dig, os);
serializeSimpleSoundSpec(sound_dug, os);
serializeSimpleSoundSpec(sound_footstep, os, version);
serializeSimpleSoundSpec(sound_dig, os, version);
serializeSimpleSoundSpec(sound_dug, os, version);

// legacy
writeU8(os, legacy_facedir_simple);
Expand Down Expand Up @@ -493,7 +498,7 @@ void ContentFeatures::deSerialize(std::istream &is)
if (version < 9) {
deSerializeOld(is, version);
return;
} else if (version > 10) {
} else if (version > 11) {
throw SerializationError("unsupported ContentFeatures version");
}

Expand Down Expand Up @@ -575,9 +580,9 @@ void ContentFeatures::deSerialize(std::istream &is)
collision_box.deSerialize(is);

// sounds
deSerializeSimpleSoundSpec(sound_footstep, is);
deSerializeSimpleSoundSpec(sound_dig, is);
deSerializeSimpleSoundSpec(sound_dug, is);
deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is, version);

// read legacy properties
legacy_facedir_simple = readU8(is);
Expand Down Expand Up @@ -1606,9 +1611,9 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
selection_box.serialize(os, protocol_version);
writeU8(os, legacy_facedir_simple);
writeU8(os, legacy_wallmounted);
serializeSimpleSoundSpec(sound_footstep, os);
serializeSimpleSoundSpec(sound_dig, os);
serializeSimpleSoundSpec(sound_dug, os);
serializeSimpleSoundSpec(sound_footstep, os, 10);
serializeSimpleSoundSpec(sound_dig, os, 10);
serializeSimpleSoundSpec(sound_dug, os, 10);
writeU8(os, rightclickable);
writeU8(os, drowning);
writeU8(os, leveled);
Expand Down Expand Up @@ -1678,9 +1683,9 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
selection_box.deSerialize(is);
legacy_facedir_simple = readU8(is);
legacy_wallmounted = readU8(is);
deSerializeSimpleSoundSpec(sound_footstep, is);
deSerializeSimpleSoundSpec(sound_dig, is);
deSerializeSimpleSoundSpec(sound_dug, is);
deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is, version);
} else if (version == 6) {
name = deSerializeString(is);
groups.clear();
Expand Down Expand Up @@ -1728,9 +1733,9 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
selection_box.deSerialize(is);
legacy_facedir_simple = readU8(is);
legacy_wallmounted = readU8(is);
deSerializeSimpleSoundSpec(sound_footstep, is);
deSerializeSimpleSoundSpec(sound_dig, is);
deSerializeSimpleSoundSpec(sound_dug, is);
deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is, version);
rightclickable = readU8(is);
drowning = readU8(is);
leveled = readU8(is);
Expand Down Expand Up @@ -1783,9 +1788,9 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
selection_box.deSerialize(is);
legacy_facedir_simple = readU8(is);
legacy_wallmounted = readU8(is);
deSerializeSimpleSoundSpec(sound_footstep, is);
deSerializeSimpleSoundSpec(sound_dig, is);
deSerializeSimpleSoundSpec(sound_dug, is);
deSerializeSimpleSoundSpec(sound_footstep, is, version);
deSerializeSimpleSoundSpec(sound_dig, is, version);
deSerializeSimpleSoundSpec(sound_dug, is, version);
rightclickable = readU8(is);
drowning = readU8(is);
leveled = readU8(is);
Expand Down

0 comments on commit 683ab3a

Please sign in to comment.