X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.cpp;h=a037c5f65c62ac11494cc96b93d0b19312f0c86f;hb=9a5d43a4f517e4f2e1810fe7c08b10e650552c52;hp=cf23e34332cd337af9b9d733021fe7d499fc97f9;hpb=b7ee608e70f8e031e3e01c9672bedb16efa648b8;p=minetest.git

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index cf23e3433..a037c5f65 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -33,52 +33,58 @@ ObjectProperties::ObjectProperties()
 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;
-	os<<", mesh="<<mesh;
-	os<<", visual_size="<<PP2(visual_size);
-	os<<", textures=[";
+	os << "hp_max=" << hp_max;
+	os << ", breath_max=" << breath_max;
+	os << ", physical=" << physical;
+	os << ", collideWithObjects=" << collideWithObjects;
+	os << ", weight=" << weight;
+	os << ", collisionbox=" << PP(collisionbox.MinEdge) << "," << PP(collisionbox.MaxEdge);
+	os << ", visual=" << visual;
+	os << ", mesh=" << mesh;
+	os << ", visual_size=" << PP(visual_size);
+	os << ", textures=[";
 	for (const std::string &texture : textures) {
-		os<<"\""<< texture <<"\" ";
+		os << "\"" << texture << "\" ";
 	}
-	os<<"]";
-	os<<", colors=[";
+	os << "]";
+	os << ", colors=[";
 	for (const video::SColor &color : colors) {
 		os << "\"" << color.getAlpha() << "," << color.getRed() << ","
 			<< color.getGreen() << "," << color.getBlue() << "\" ";
 	}
-	os<<"]";
-	os<<", spritediv="<<PP2(spritediv);
-	os<<", initial_sprite_basepos="<<PP2(initial_sprite_basepos);
-	os<<", is_visible="<<is_visible;
-	os<<", makes_footstep_sound="<<makes_footstep_sound;
-	os<<", automatic_rotate="<<automatic_rotate;
-	os<<", backface_culling="<<backface_culling;
+	os << "]";
+	os << ", spritediv=" << PP2(spritediv);
+	os << ", initial_sprite_basepos=" << PP2(initial_sprite_basepos);
+	os << ", is_visible=" << is_visible;
+	os << ", makes_footstep_sound=" << makes_footstep_sound;
+	os << ", automatic_rotate="<< automatic_rotate;
+	os << ", backface_culling="<< backface_culling;
+	os << ", glow=" << glow;
 	os << ", nametag=" << nametag;
 	os << ", nametag_color=" << "\"" << nametag_color.getAlpha() << "," << nametag_color.getRed()
 			<< "," << nametag_color.getGreen() << "," << nametag_color.getBlue() << "\" ";
 	os << ", selectionbox=" << PP(selectionbox.MinEdge) << "," << PP(selectionbox.MaxEdge);
 	os << ", pointable=" << pointable;
+	os << ", static_save=" << static_save;
+	os << ", eye_height=" << eye_height;
+	os << ", zoom_fov=" << zoom_fov;
+	os << ", use_texture_alpha=" << use_texture_alpha;
 	return os.str();
 }
 
 void ObjectProperties::serialize(std::ostream &os) const
 {
-	writeU8(os, 2); // version, protocol_version >= 36
-	writeS16(os, hp_max);
+	writeU8(os, 4); // PROTOCOL_VERSION >= 37
+	writeU16(os, hp_max);
 	writeU8(os, physical);
-	writeF1000(os, weight);
-	writeV3F1000(os, collisionbox.MinEdge);
-	writeV3F1000(os, collisionbox.MaxEdge);
-	writeV3F1000(os, selectionbox.MinEdge);
-	writeV3F1000(os, selectionbox.MaxEdge);
+	writeF32(os, weight);
+	writeV3F32(os, collisionbox.MinEdge);
+	writeV3F32(os, collisionbox.MaxEdge);
+	writeV3F32(os, selectionbox.MinEdge);
+	writeV3F32(os, selectionbox.MaxEdge);
 	writeU8(os, pointable);
 	os << serializeString(visual);
-	writeV2F1000(os, visual_size);
+	writeV3F32(os, visual_size);
 	writeU16(os, textures.size());
 	for (const std::string &texture : textures) {
 		os << serializeString(texture);
@@ -87,7 +93,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV2S16(os, initial_sprite_basepos);
 	writeU8(os, is_visible);
 	writeU8(os, makes_footstep_sound);
-	writeF1000(os, automatic_rotate);
+	writeF32(os, automatic_rotate);
 	// Added in protocol version 14
 	os << serializeString(mesh);
 	writeU16(os, colors.size());
@@ -95,15 +101,20 @@ void ObjectProperties::serialize(std::ostream &os) const
 		writeARGB8(os, color);
 	}
 	writeU8(os, collideWithObjects);
-	writeF1000(os,stepheight);
+	writeF32(os, stepheight);
 	writeU8(os, automatic_face_movement_dir);
-	writeF1000(os, automatic_face_movement_dir_offset);
+	writeF32(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);
+	writeF32(os, automatic_face_movement_max_rotation_per_sec);
 	os << serializeString(infotext);
 	os << serializeString(wield_item);
+	writeS8(os, glow);
+	writeU16(os, breath_max);
+	writeF32(os, eye_height);
+	writeF32(os, zoom_fov);
+	writeU8(os, use_texture_alpha);
 
 	// Add stuff only at the bottom.
 	// Never remove anything, because we don't want new versions of this
@@ -112,19 +123,19 @@ void ObjectProperties::serialize(std::ostream &os) const
 void ObjectProperties::deSerialize(std::istream &is)
 {
 	int version = readU8(is);
-	if (version != 2)
+	if (version != 4)
 		throw SerializationError("unsupported ObjectProperties version");
 
-	hp_max = readS16(is);
+	hp_max = readU16(is);
 	physical = readU8(is);
-	weight = readF1000(is);
-	collisionbox.MinEdge = readV3F1000(is);
-	collisionbox.MaxEdge = readV3F1000(is);
-	selectionbox.MinEdge = readV3F1000(is);
-	selectionbox.MaxEdge = readV3F1000(is);
+	weight = readF32(is);
+	collisionbox.MinEdge = readV3F32(is);
+	collisionbox.MaxEdge = readV3F32(is);
+	selectionbox.MinEdge = readV3F32(is);
+	selectionbox.MaxEdge = readV3F32(is);
 	pointable = readU8(is);
 	visual = deSerializeString(is);
-	visual_size = readV2F1000(is);
+	visual_size = readV3F32(is);
 	textures.clear();
 	u32 texture_count = readU16(is);
 	for (u32 i = 0; i < texture_count; i++){
@@ -134,20 +145,26 @@ void ObjectProperties::deSerialize(std::istream &is)
 	initial_sprite_basepos = readV2S16(is);
 	is_visible = readU8(is);
 	makes_footstep_sound = readU8(is);
-	automatic_rotate = readF1000(is);
+	automatic_rotate = readF32(is);
 	mesh = deSerializeString(is);
+	colors.clear();
 	u32 color_count = readU16(is);
 	for (u32 i = 0; i < color_count; i++){
 		colors.push_back(readARGB8(is));
 	}
 	collideWithObjects = readU8(is);
-	stepheight = readF1000(is);
+	stepheight = readF32(is);
 	automatic_face_movement_dir = readU8(is);
-	automatic_face_movement_dir_offset = readF1000(is);
+	automatic_face_movement_dir_offset = readF32(is);
 	backface_culling = readU8(is);
 	nametag = deSerializeString(is);
 	nametag_color = readARGB8(is);
-	automatic_face_movement_max_rotation_per_sec = readF1000(is);
+	automatic_face_movement_max_rotation_per_sec = readF32(is);
 	infotext = deSerializeString(is);
 	wield_item = deSerializeString(is);
+	glow = readS8(is);
+	breath_max = readU16(is);
+	eye_height = readF32(is);
+	zoom_fov = readF32(is);
+	use_texture_alpha = readU8(is);
 }