Move client-specific files to 'src/client' (#7902)

[oweals/minetest.git] / src / object_properties.cpp

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 26a19a08245014a1a136399f41d2e76b455c97cc..d42fbcc6caaa8377d2b918a851f30acf9761815f 100644 (file)
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -68,6 +68,7 @@ std::string ObjectProperties::dump()
        os << ", static_save=" << static_save;
        os << ", eye_height=" << eye_height;
        os << ", zoom_fov=" << zoom_fov;
+       os << ", use_texture_alpha=" << use_texture_alpha;
        return os.str();
 }
 
@@ -113,6 +114,7 @@ void ObjectProperties::serialize(std::ostream &os) const
        writeU16(os, breath_max);
        writeF1000(os, eye_height);
        writeF1000(os, zoom_fov);
+       writeU8(os, use_texture_alpha);
 
        // Add stuff only at the bottom.
        // Never remove anything, because we don't want new versions of this
@@ -145,6 +147,7 @@ void ObjectProperties::deSerialize(std::istream &is)
        makes_footstep_sound = readU8(is);
        automatic_rotate = readF1000(is);
        mesh = deSerializeString(is);
+       colors.clear();
        u32 color_count = readU16(is);
        for (u32 i = 0; i < color_count; i++){
                colors.push_back(readARGB8(is));
@@ -163,4 +166,5 @@ void ObjectProperties::deSerialize(std::istream &is)
        breath_max = readU16(is);
        eye_height = readF1000(is);
        zoom_fov = readF1000(is);
+       use_texture_alpha = readU8(is);
 }