X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgenericobject.cpp;h=d86c47eb93b565393dbc53fff49caeef7da89834;hb=b1e58c9c35ae3eb6167a0745086cdb0ddb1dd9d7;hp=482dbbc78d56eb2c05b287cc6bbd6e1cb9ef1210;hpb=e42eeec8f626acbaa54ae31c10ca06c868c7931c;p=dragonfireclient.git

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 482dbbc78..d86c47eb9 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.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
@@ -68,7 +68,7 @@ std::string gob_cmd_update_position(
 std::string gob_cmd_set_texture_mod(const std::string &mod)
 {
 	std::ostringstream os(std::ios::binary);
-	// command 
+	// command
 	writeU8(os, GENERIC_CMD_SET_TEXTURE_MOD);
 	// parameters
 	os<<serializeString(mod);
@@ -92,34 +92,77 @@ std::string gob_cmd_set_sprite(
 	return os.str();
 }
 
-std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend)
+std::string gob_cmd_punched(s16 damage, s16 result_hp)
 {
 	std::ostringstream os(std::ios::binary);
-	// command 
-	writeU8(os, GENERIC_CMD_SET_ANIMATIONS);
+	// command
+	writeU8(os, GENERIC_CMD_PUNCHED);
+	// damage
+	writeS16(os, damage);
+	// result_hp
+	writeS16(os, result_hp);
+	return os.str();
+}
+
+std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
+{
+	std::ostringstream os(std::ios::binary);
+	writeU8(os, GENERIC_CMD_UPDATE_ARMOR_GROUPS);
+	writeU16(os, armor_groups.size());
+	for (const auto &armor_group : armor_groups) {
+		os<<serializeString(armor_group.first);
+		writeS16(os, armor_group.second);
+	}
+	return os.str();
+}
+
+std::string gob_cmd_update_physics_override(float physics_override_speed, float physics_override_jump,
+		float physics_override_gravity, bool sneak, bool sneak_glitch, bool new_move)
+{
+	std::ostringstream os(std::ios::binary);
+	// command
+	writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
+	// parameters
+	writeF1000(os, physics_override_speed);
+	writeF1000(os, physics_override_jump);
+	writeF1000(os, physics_override_gravity);
+	// these are sent inverted so we get true when the server sends nothing
+	writeU8(os, !sneak);
+	writeU8(os, !sneak_glitch);
+	writeU8(os, !new_move);
+	return os.str();
+}
+
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
+{
+	std::ostringstream os(std::ios::binary);
+	// command
+	writeU8(os, GENERIC_CMD_SET_ANIMATION);
 	// parameters
 	writeV2F1000(os, frames);
 	writeF1000(os, frame_speed);
 	writeF1000(os, frame_blend);
+	// these are sent inverted so we get true when the server sends nothing
+	writeU8(os, !frame_loop);
 	return os.str();
 }
 
-// Part of the attachment structure, not used yet!
-std::string gob_cmd_set_attachment() // <- parameters here
+std::string gob_cmd_update_animation_speed(float frame_speed)
 {
 	std::ostringstream os(std::ios::binary);
-	// command 
-	writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+	// command
+	writeU8(os, GENERIC_CMD_SET_ANIMATION_SPEED);
 	// parameters
-	// Parameters go here
+	writeF1000(os, frame_speed);
 	return os.str();
 }
 
-std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
+std::string gob_cmd_update_bone_position(const std::string &bone, v3f position,
+		v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
-	// command 
-	writeU8(os, GENERIC_CMD_SET_BONE_POSROT);
+	// command
+	writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
 	// parameters
 	os<<serializeString(bone);
 	writeV3F1000(os, position);
@@ -127,29 +170,40 @@ std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation
 	return os.str();
 }
 
-std::string gob_cmd_punched(s16 damage, s16 result_hp)
+std::string gob_cmd_update_attachment(int parent_id, const std::string &bone,
+		v3f position, v3f rotation)
 {
 	std::ostringstream os(std::ios::binary);
-	// command 
-	writeU8(os, GENERIC_CMD_PUNCHED);
-	// damage
-	writeS16(os, damage);
-	// result_hp
-	writeS16(os, result_hp);
+	// command
+	writeU8(os, GENERIC_CMD_ATTACH_TO);
+	// parameters
+	writeS16(os, parent_id);
+	os<<serializeString(bone);
+	writeV3F1000(os, position);
+	writeV3F1000(os, rotation);
 	return os.str();
 }
 
-std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
+std::string gob_cmd_update_nametag_attributes(video::SColor color)
 {
 	std::ostringstream os(std::ios::binary);
-	writeU8(os, GENERIC_CMD_UPDATE_ARMOR_GROUPS);
-	writeU16(os, armor_groups.size());
-	for(ItemGroupList::const_iterator i = armor_groups.begin();
-			i != armor_groups.end(); i++){
-		os<<serializeString(i->first);
-		writeS16(os, i->second);
-	}
+	// command
+	writeU8(os, GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES);
+	// parameters
+	writeU8(os, 1); // version for forward compatibility
+	writeARGB8(os, color);
 	return os.str();
 }
 
-
+std::string gob_cmd_update_infant(u16 id, u8 type,
+		const std::string &client_initialization_data)
+{
+	std::ostringstream os(std::ios::binary);
+	// command
+	writeU8(os, GENERIC_CMD_SPAWN_INFANT);
+	// parameters
+	writeU16(os, id);
+	writeU8(os, type);
+	os<<serializeLongString(client_initialization_data);
+	return os.str();
+}