X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fluaentity_common.cpp;h=63c3f2d6b13c0e0a6b6b21d212ffc7243ae4de82;hb=c0530921ffac89c2249500ba0a1bddd9d288cfbe;hp=26cfce1c2e6735bad6281b88ecd68aa550a12a92;hpb=75a0ca6bd67aa9ca87668bc27d36399b5028c2b1;p=dragonfireclient.git

diff --git a/src/luaentity_common.cpp b/src/luaentity_common.cpp
index 26cfce1c2..63c3f2d6b 100644
--- a/src/luaentity_common.cpp
+++ b/src/luaentity_common.cpp
@@ -22,60 +22,77 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "utility.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
+#define PP2(x) "("<<(x).X<<","<<(x).Y<<")"
 
 LuaEntityProperties::LuaEntityProperties():
-	physical(true),
+	hp_max(1),
+	physical(false),
 	weight(5),
 	collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
-	visual("single_sprite")
+	visual("sprite"),
+	visual_size(1,1),
+	spritediv(1,1),
+	initial_sprite_basepos(0,0)
 {
-	textures.push_back("unknown_block.png");
+	textures.push_back("unknown_object.png");
 }
 
 std::string LuaEntityProperties::dump()
 {
 	std::ostringstream os(std::ios::binary);
-	os<<"physical="<<physical;
+	os<<"hp_max="<<hp_max;
+	os<<", physical="<<physical;
 	os<<", weight="<<weight;
 	os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
 	os<<", visual="<<visual;
+	os<<", visual_size="<<PP2(visual_size);
 	os<<", textures=[";
 	for(u32 i=0; i<textures.size(); i++){
 		os<<"\""<<textures[i]<<"\" ";
 	}
 	os<<"]";
+	os<<", spritediv="<<PP2(spritediv);
+	os<<", initial_sprite_basepos="<<PP2(initial_sprite_basepos);
 	return os.str();
 }
 
 void LuaEntityProperties::serialize(std::ostream &os)
 {
-	writeU8(os, 0); // version
+	writeU8(os, 1); // version
+	writeS16(os, hp_max);
 	writeU8(os, physical);
 	writeF1000(os, weight);
 	writeV3F1000(os, collisionbox.MinEdge);
 	writeV3F1000(os, collisionbox.MaxEdge);
 	os<<serializeString(visual);
+	writeV2F1000(os, visual_size);
 	writeU16(os, textures.size());
 	for(u32 i=0; i<textures.size(); i++){
 		os<<serializeString(textures[i]);
 	}
+	writeV2S16(os, spritediv);
+	writeV2S16(os, initial_sprite_basepos);
 }
 
 void LuaEntityProperties::deSerialize(std::istream &is)
 {
 	int version = readU8(is);
-	if(version != 0) throw SerializationError(
+	if(version != 1) throw SerializationError(
 			"unsupported LuaEntityProperties version");
+	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);
 }