Mgfractal: Move julia set selection into formula parameter

[dragonfireclient.git] / src / object_properties.cpp

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index c2debf328296eabbc34b2a18bfd4346101f65c4b..dc1eddf4eeae2c296a82aa4eb76b2d7c891f2302 100644 (file)
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -19,9 +19,9 @@ 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 <sstream>
-#include <map>
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 #define PP2(x) "("<<(x).X<<","<<(x).Y<<")"
@@ -39,7 +39,11 @@ ObjectProperties::ObjectProperties():
        initial_sprite_basepos(0,0),
        is_visible(true),
        makes_footstep_sound(false),
-       automatic_rotate(0)
+       automatic_rotate(0),
+       stepheight(0),
+       automatic_face_movement_dir(false),
+       automatic_face_movement_dir_offset(0.0),
+       backface_culling(true)
 {
        textures.push_back("unknown_object.png");
        colors.push_back(video::SColor(255,255,255,255));
@@ -71,6 +75,7 @@ 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;
        return os.str();
 }
 
@@ -100,6 +105,10 @@ void ObjectProperties::serialize(std::ostream &os) const
                writeARGB8(os, colors[i]);
        }
        writeU8(os, collideWithObjects);
+       writeF1000(os,stepheight);
+       writeU8(os, automatic_face_movement_dir);
+       writeF1000(os, automatic_face_movement_dir_offset);
+       writeU8(os, backface_culling);
        // Add stuff only at the bottom.
        // Never remove anything, because we don't want new versions of this
 }
@@ -133,6 +142,10 @@ void ObjectProperties::deSerialize(std::istream &is)
                                colors.push_back(readARGB8(is));
                        }
                        collideWithObjects = readU8(is);
+                       stepheight = readF1000(is);
+                       automatic_face_movement_dir = readU8(is);
+                       automatic_face_movement_dir_offset = readF1000(is);
+                       backface_culling = readU8(is);
                }catch(SerializationError &e){}
        }
        else
@@ -140,4 +153,3 @@ void ObjectProperties::deSerialize(std::istream &is)
                throw SerializationError("unsupported ObjectProperties version");
        }
 }
-