From c68ea19e8dd54c497b0fd3f16f26d063318e8bf6 Mon Sep 17 00:00:00 2001 From: JacobF Date: Thu, 1 Sep 2011 17:16:55 -0400 Subject: Now SAOs will reflect changes to their temporary inventory object Also, the temp item wasn't being deleted, might have been a memory leak. Now you will only eat 1 item off a stack --- src/inventory.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/inventory.cpp') diff --git a/src/inventory.cpp b/src/inventory.cpp index 116ceeb6d..f31e19f77 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -122,16 +122,20 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is) } } +std::string InventoryItem::getItemString() { + // Get item string + std::ostringstream os(std::ios_base::binary); + serialize(os); + return os.str(); +} + ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f pos) { /* Create an ItemSAO */ - // Get item string - std::ostringstream os(std::ios_base::binary); - serialize(os); // Create object - ServerActiveObject *obj = new ItemSAO(env, 0, pos, os.str()); + ServerActiveObject *obj = new ItemSAO(env, 0, pos, getItemString()); return obj; } @@ -200,12 +204,17 @@ bool CraftItem::use(ServerEnvironment *env, Player *player) { if(item_craft_is_eatable(m_subname)) { + u16 result_count = getCount() - 1; // Eat one at a time s16 hp_change = item_craft_eat_hp_change(m_subname); if(player->hp + hp_change > 20) player->hp = 20; else player->hp += hp_change; - return true; + + if(result_count < 1) + return true; + else + setCount(result_count); } return false; } -- cgit v1.2.3