summaryrefslogtreecommitdiff
path: root/src/nodedef.cpp
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-07-20 21:25:21 +0200
committerPilzAdam <pilzadam@minetest.net>2013-07-20 21:25:21 +0200
commit46d1d70e4c37973a9d9c9b69b150731ca9f53b7d (patch)
tree88937e4011cf962b90ac499b16b17784903c8d66 /src/nodedef.cpp
parent8cae65978611476d0da215acf61819a905c68267 (diff)
downloadminetest-46d1d70e4c37973a9d9c9b69b150731ca9f53b7d.tar.gz
minetest-46d1d70e4c37973a9d9c9b69b150731ca9f53b7d.tar.bz2
minetest-46d1d70e4c37973a9d9c9b69b150731ca9f53b7d.zip
Bump protocol version
Diffstat (limited to 'src/nodedef.cpp')
-rw-r--r--src/nodedef.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index b1ce7bbc8..a4d036883 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -281,11 +281,11 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version)
serializeSimpleSoundSpec(sound_dig, os);
serializeSimpleSoundSpec(sound_dug, os);
writeU8(os, rightclickable);
- // Stuff below should be moved to correct place in a version that otherwise changes
- // the protocol version
writeU8(os, drowning);
writeU8(os, leveled);
writeU8(os, liquid_range);
+ // Stuff below should be moved to correct place in a version that otherwise changes
+ // the protocol version
}
void ContentFeatures::deSerialize(std::istream &is)
@@ -345,14 +345,14 @@ void ContentFeatures::deSerialize(std::istream &is)
deSerializeSimpleSoundSpec(sound_dig, is);
deSerializeSimpleSoundSpec(sound_dug, is);
rightclickable = readU8(is);
+ drowning = readU8(is);
+ leveled = readU8(is);
+ liquid_range = readU8(is);
// If you add anything here, insert it primarily inside the try-catch
// block to not need to increase the version.
try{
// Stuff below should be moved to correct place in a version that
// otherwise changes the protocol version
- drowning = readU8(is);
- leveled = readU8(is);
- liquid_range = readU8(is);
}catch(SerializationError &e) {};
}