Replace std::list by std::vector into ServerMap::listAllLoadableBlocks ServerMap...

[minetest.git] / src / genericobject.cpp

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 482dbbc78d56eb2c05b287cc6bbd6e1cb9ef1210..9a1b9d8d0dc657b109220b3d2a2d5877cce5277d 100644 (file)
--- 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
@@ -92,64 +92,81 @@ 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);
-       // parameters
-       writeV2F1000(os, frames);
-       writeF1000(os, frame_speed);
-       writeF1000(os, frame_blend);
+       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(ItemGroupList::const_iterator i = armor_groups.begin();
+                       i != armor_groups.end(); i++){
+               os<<serializeString(i->first);
+               writeS16(os, i->second);
+       }
        return os.str();
 }
 
-// Part of the attachment structure, not used yet!
-std::string gob_cmd_set_attachment() // <- parameters here
+std::string gob_cmd_update_physics_override(float physics_override_speed, float physics_override_jump,
+               float physics_override_gravity, bool sneak, bool sneak_glitch)
 {
        std::ostringstream os(std::ios::binary);
        // command 
-       writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+       writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
        // parameters
-       // Parameters go here
+       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);
        return os.str();
 }
 
-std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend)
 {
        std::ostringstream os(std::ios::binary);
        // command 
-       writeU8(os, GENERIC_CMD_SET_BONE_POSROT);
+       writeU8(os, GENERIC_CMD_SET_ANIMATION);
        // parameters
-       os<<serializeString(bone);
-       writeV3F1000(os, position);
-       writeV3F1000(os, rotation);
+       writeV2F1000(os, frames);
+       writeF1000(os, frame_speed);
+       writeF1000(os, frame_blend);
        return os.str();
 }
 
-std::string gob_cmd_punched(s16 damage, s16 result_hp)
+std::string gob_cmd_update_bone_position(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);
+       writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
+       // parameters
+       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_attachment(int parent_id, std::string bone, v3f position, v3f rotation)
 {
        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_SET_ATTACHMENT);
+       // parameters
+       writeS16(os, parent_id);
+       os<<serializeString(bone);
+       writeV3F1000(os, position);
+       writeV3F1000(os, rotation);
        return os.str();
 }
 
-