From 30ec69c7d393f09bc683ef9894da2ddbae15fc6f Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 29 Nov 2012 19:22:07 +0200 Subject: Fix Taoki's messed up generic object command ids --- src/genericobject.cpp | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) (limited to 'src/genericobject.cpp') diff --git a/src/genericobject.cpp b/src/genericobject.cpp index 654548fa1..398b07feb 100644 --- a/src/genericobject.cpp +++ b/src/genericobject.cpp @@ -92,6 +92,31 @@ std::string gob_cmd_set_sprite( return os.str(); } +std::string gob_cmd_punched(s16 damage, s16 result_hp) +{ + std::ostringstream os(std::ios::binary); + // 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(ItemGroupList::const_iterator i = armor_groups.begin(); + i != armor_groups.end(); i++){ + os<first); + writeS16(os, i->second); + } + return os.str(); +} + std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend) { std::ostringstream os(std::ios::binary); @@ -129,29 +154,3 @@ std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f posit return os.str(); } -std::string gob_cmd_punched(s16 damage, s16 result_hp) -{ - std::ostringstream os(std::ios::binary); - // 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(ItemGroupList::const_iterator i = armor_groups.begin(); - i != armor_groups.end(); i++){ - os<first); - writeS16(os, i->second); - } - return os.str(); -} - - -- cgit v1.2.3