diff options
Diffstat (limited to 'src/nodedef.cpp')
| -rw-r--r-- | src/nodedef.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 466531efa..180219ba8 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -254,7 +254,6 @@ void ContentFeatures::serialize(std::ostream &os) os<<serializeString(liquid_alternative_flowing); os<<serializeString(liquid_alternative_source); writeU8(os, liquid_viscosity); - writeU8(os, liquid_renewable); writeU8(os, light_source); writeU32(os, damage_per_second); node_box.serialize(os); @@ -264,6 +263,9 @@ void ContentFeatures::serialize(std::ostream &os) serializeSimpleSoundSpec(sound_footstep, os); serializeSimpleSoundSpec(sound_dig, os); serializeSimpleSoundSpec(sound_dug, os); + // Stuff below should be moved to correct place in a version that otherwise changes + // the protocol version + writeU8(os, liquid_renewable); } void ContentFeatures::deSerialize(std::istream &is) @@ -309,7 +311,6 @@ void ContentFeatures::deSerialize(std::istream &is) liquid_alternative_flowing = deSerializeString(is); liquid_alternative_source = deSerializeString(is); liquid_viscosity = readU8(is); - liquid_renewable = readU8(is); light_source = readU8(is); damage_per_second = readU32(is); node_box.deSerialize(is); @@ -322,6 +323,9 @@ void ContentFeatures::deSerialize(std::istream &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 + liquid_renewable = readU8(is); }catch(SerializationError &e) {}; } |