Works for debian and a few other distributions but fails for even more so back to...

[minetest.git] / src / object_properties.cpp

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 79b3eaf7287639595318c40316848d1b44301393..f560f59343a6d6507e6993d8b2aaacb43c84b2af 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,10 @@ 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)
 {
        textures.push_back("unknown_object.png");
        colors.push_back(video::SColor(255,255,255,255));
@@ -49,6 +53,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;
@@ -81,52 +86,67 @@ void ObjectProperties::serialize(std::ostream &os) const
        writeV3F1000(os, collisionbox.MinEdge);
        writeV3F1000(os, collisionbox.MaxEdge);
        os<<serializeString(visual);
-       os<<serializeString(mesh);
        writeV2F1000(os, visual_size);
        writeU16(os, textures.size());
        for(u32 i=0; i<textures.size(); i++){
                os<<serializeString(textures[i]);
        }
-       writeU16(os, colors.size());
-       for(u32 i=0; i<colors.size(); i++){
-               writeARGB8(os, colors[i]);
-       }
        writeV2S16(os, spritediv);
        writeV2S16(os, initial_sprite_basepos);
        writeU8(os, is_visible);
        writeU8(os, makes_footstep_sound);
        writeF1000(os, automatic_rotate);
+       // Added in protocol version 14
+       os<<serializeString(mesh);
+       writeU16(os, colors.size());
+       for(u32 i=0; i<colors.size(); i++){
+               writeARGB8(os, colors[i]);
+       }
+       writeU8(os, collideWithObjects);
+       writeF1000(os,stepheight);
+       writeU8(os, automatic_face_movement_dir);
+       writeF1000(os, automatic_face_movement_dir_offset);
+       // Add stuff only at the bottom.
+       // Never remove anything, because we don't want new versions of this
 }
 
 void ObjectProperties::deSerialize(std::istream &is)
 {
        int version = readU8(is);
-       if(version != 1) throw SerializationError(
-                       "unsupported ObjectProperties version");
-       hp_max = readS16(is);
-       physical = readU8(is);
-       weight = readF1000(is);
-       collisionbox.MinEdge = readV3F1000(is);
-       collisionbox.MaxEdge = readV3F1000(is);
-       visual = deSerializeString(is);
-       mesh = deSerializeString(is);
-       visual_size = readV2F1000(is);
-       textures.clear();
-       u32 texture_count = readU16(is);
-       for(u32 i=0; i<texture_count; i++){
-               textures.push_back(deSerializeString(is));
+       if(version == 1)
+       {
+               try{
+                       hp_max = readS16(is);
+                       physical = readU8(is);
+                       weight = readF1000(is);
+                       collisionbox.MinEdge = readV3F1000(is);
+                       collisionbox.MaxEdge = readV3F1000(is);
+                       visual = deSerializeString(is);
+                       visual_size = readV2F1000(is);
+                       textures.clear();
+                       u32 texture_count = readU16(is);
+                       for(u32 i=0; i<texture_count; i++){
+                               textures.push_back(deSerializeString(is));
+                       }
+                       spritediv = readV2S16(is);
+                       initial_sprite_basepos = readV2S16(is);
+                       is_visible = readU8(is);
+                       makes_footstep_sound = readU8(is);
+                       automatic_rotate = readF1000(is);
+                       mesh = deSerializeString(is);
+                       u32 color_count = readU16(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);
+                       automatic_face_movement_dir_offset = readF1000(is);
+               }catch(SerializationError &e){}
        }
-       u32 color_count = readU16(is);
-       for(u32 i=0; i<color_count; i++){
-               colors.push_back(readARGB8(is));
+       else
+       {
+               throw SerializationError("unsupported ObjectProperties version");
        }
-       spritediv = readV2S16(is);
-       initial_sprite_basepos = readV2S16(is);
-       is_visible = readU8(is);
-       makes_footstep_sound = readU8(is);
-       try{
-               automatic_rotate = readF1000(is);
-       }catch(SerializationError &e){}
 }
 
-