Update to minetest 5.4.0-dev

1 files changed, 11 insertions, 0 deletions

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 4cf180b18..8d51bcbfa 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -68,6 +68,8 @@ std::string ObjectProperties::dump()
 	os << ", eye_height=" << eye_height;
 	os << ", zoom_fov=" << zoom_fov;
 	os << ", use_texture_alpha=" << use_texture_alpha;
+	os << ", damage_texture_modifier=" << damage_texture_modifier;
+	os << ", shaded=" << shaded;
 	return os.str();
 }
 
@@ -114,6 +116,8 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeF32(os, eye_height);
 	writeF32(os, zoom_fov);
 	writeU8(os, use_texture_alpha);
+	os << serializeString(damage_texture_modifier);
+	writeU8(os, shaded);
 
 	// Add stuff only at the bottom.
 	// Never remove anything, because we don't want new versions of this
@@ -166,4 +170,11 @@ void ObjectProperties::deSerialize(std::istream &is)
 	eye_height = readF32(is);
 	zoom_fov = readF32(is);
 	use_texture_alpha = readU8(is);
+	try {
+		damage_texture_modifier = deSerializeString(is);
+		u8 tmp = readU8(is);
+		if (is.eof())
+			throw SerializationError("");
+		shaded = tmp;
+	} catch (SerializationError &e) {}
 }