Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu

[dragonfireclient.git] / src / object_properties.cpp

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index ec988a37d2a511422ed67a90c9a89828c6bdbb5e..b6ad9f6dfa85057b3371232b56b6235e008eab37 100644 (file)
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -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<<")"
@@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 ObjectProperties::ObjectProperties():
        hp_max(1),
        physical(false),
+       collideWithObjects(true),
        weight(5),
        collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
        visual("sprite"),
@@ -38,7 +39,9 @@ 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)
 {
        textures.push_back("unknown_object.png");
        colors.push_back(video::SColor(255,255,255,255));
@@ -49,6 +52,7 @@ std::string ObjectProperties::dump()
        std::ostringstream os(std::ios::binary);
        os<<"hp_max="<<hp_max;
        os<<", physical="<<physical;
+       os<<", collideWithObjects="<<collideWithObjects;
        os<<", weight="<<weight;
        os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
        os<<", visual="<<visual;
@@ -97,6 +101,9 @@ void ObjectProperties::serialize(std::ostream &os) const
        for(u32 i=0; i<colors.size(); i++){
                writeARGB8(os, colors[i]);
        }
+       writeU8(os, collideWithObjects);
+       writeF1000(os,stepheight);
+       writeU8(os, automatic_face_movement_dir);
        // Add stuff only at the bottom.
        // Never remove anything, because we don't want new versions of this
 }
@@ -129,6 +136,9 @@ void ObjectProperties::deSerialize(std::istream &is)
                        for(u32 i=0; i<color_count; i++){
                                colors.push_back(readARGB8(is));
                        }
+                       collideWithObjects = readU8(is);
+                       stepheight = readF1000(is);
+                       automatic_face_movement_dir = readU8(is);
                }catch(SerializationError &e){}
        }
        else