X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.cpp;h=89ca26274a805b239e20431e0b45442dd92f7572;hb=2607b97b4f2b41767d7a010e9376d3e7f578cb71;hp=c02203a81d8d4244d6030374c50c9b2971bb1e28;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=dragonfireclient.git

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index c02203a81..89ca26274 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+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,14 @@ 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),
+	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));
@@ -49,6 +57,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;
@@ -69,6 +78,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();
 }
 
@@ -97,6 +110,16 @@ 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);
+	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);
+
 	// Add stuff only at the bottom.
 	// Never remove anything, because we don't want new versions of this
 }
@@ -129,6 +152,15 @@ 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);
+			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);
 		}catch(SerializationError &e){}
 	}
 	else
@@ -136,4 +168,3 @@ void ObjectProperties::deSerialize(std::istream &is)
 		throw SerializationError("unsupported ObjectProperties version");
 	}
 }
-