Cleanup in content_mapblock (#5746)

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

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 1602f03f20312faff3873cb3919b333f89b961a4..a77368151db64753f26314cf7b7fffbbfd53117d 100644 (file)
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -19,12 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "object_properties.h"
 #include "irrlichttypes_bloated.h"
+#include "exceptions.h"
 #include "util/serialize.h"
+#include "util/basic_macros.h"
 #include <sstream>
-#include <map>
-
-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
-#define PP2(x) "("<<(x).X<<","<<(x).Y<<")"
 
 ObjectProperties::ObjectProperties():
        hp_max(1),
@@ -40,7 +38,13 @@ ObjectProperties::ObjectProperties():
        is_visible(true),
        makes_footstep_sound(false),
        automatic_rotate(0),
-       stepheight(0)
+       stepheight(0),
+       automatic_face_movement_dir(false),
+       automatic_face_movement_dir_offset(0.0),
+       backface_culling(true),
+       nametag(""),
+       nametag_color(255, 255, 255, 255),
+       automatic_face_movement_max_rotation_per_sec(-1)
 {
        textures.push_back("unknown_object.png");
        colors.push_back(video::SColor(255,255,255,255));
@@ -72,6 +76,10 @@ std::string ObjectProperties::dump()
        os<<", is_visible="<<is_visible;
        os<<", makes_footstep_sound="<<makes_footstep_sound;
        os<<", automatic_rotate="<<automatic_rotate;
+       os<<", backface_culling="<<backface_culling;
+       os << ", nametag=" << nametag;
+       os << ", nametag_color=" << "\"" << nametag_color.getAlpha() << "," << nametag_color.getRed()
+                       << "," << nametag_color.getGreen() << "," << nametag_color.getBlue() << "\" ";
        return os.str();
 }
 
@@ -102,6 +110,15 @@ void ObjectProperties::serialize(std::ostream &os) const
        }
        writeU8(os, collideWithObjects);
        writeF1000(os,stepheight);
+       writeU8(os, automatic_face_movement_dir);
+       writeF1000(os, automatic_face_movement_dir_offset);
+       writeU8(os, backface_culling);
+       os << serializeString(nametag);
+       writeARGB8(os, nametag_color);
+       writeF1000(os, automatic_face_movement_max_rotation_per_sec);
+       os << serializeString(infotext);
+       os << serializeString(wield_item);
+
        // Add stuff only at the bottom.
        // Never remove anything, because we don't want new versions of this
 }
@@ -136,6 +153,14 @@ void ObjectProperties::deSerialize(std::istream &is)
                        }
                        collideWithObjects = readU8(is);
                        stepheight = readF1000(is);
+                       automatic_face_movement_dir = readU8(is);
+                       automatic_face_movement_dir_offset = readF1000(is);
+                       backface_culling = readU8(is);
+                       nametag = deSerializeString(is);
+                       nametag_color = readARGB8(is);
+                       automatic_face_movement_max_rotation_per_sec = readF1000(is);
+                       infotext = deSerializeString(is);
+                       wield_item = deSerializeString(is);
                }catch(SerializationError &e){}
        }
        else
@@ -143,4 +168,3 @@ void ObjectProperties::deSerialize(std::istream &is)
                throw SerializationError("unsupported ObjectProperties version");
        }
 }
-