summaryrefslogtreecommitdiff
path: root/src/object_properties.cpp
diff options
context:
space:
mode:
authorLars Müller <34514239+appgurueu@users.noreply.github.com>2020-05-11 21:41:36 +0200
committerGitHub <noreply@github.com>2020-05-11 21:41:36 +0200
commit9ba24f89f5846de6a8f0d7e01c89acfee1254704 (patch)
tree868e0cee87d50271c4fe088d87aa2cb10a849f7f /src/object_properties.cpp
parent6e1372bd894d955300c40d69e5c882e9cc7d7523 (diff)
downloadminetest-9ba24f89f5846de6a8f0d7e01c89acfee1254704.tar.gz
minetest-9ba24f89f5846de6a8f0d7e01c89acfee1254704.tar.bz2
minetest-9ba24f89f5846de6a8f0d7e01c89acfee1254704.zip
Damage texture modifier (#9833)
Adds a new object property "damage_texture_modifier"
Diffstat (limited to 'src/object_properties.cpp')
-rw-r--r--src/object_properties.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 4cf180b18..6ff344dce 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -68,6 +68,7 @@ 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;
return os.str();
}
@@ -114,6 +115,7 @@ 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);
// Add stuff only at the bottom.
// Never remove anything, because we don't want new versions of this
@@ -166,4 +168,7 @@ 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);
+ } catch (SerializationError &e) {}
}