Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff

[dragonfireclient.git] / src / inventory.cpp

diff --git a/src/inventory.cpp b/src/inventory.cpp
index 45646a69a40791b73e683ad319e917baa5f21954..ec1a81b180a25013c3c18f79111623d5d24672c8 100644 (file)
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_sao.h"
 #include "player.h"
 #include "log.h"
+#include "mapnode_contentfeatures.h"
 
 /*
        InventoryItem
@@ -148,6 +149,13 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f
        MaterialItem
 */
 
+#ifndef SERVER
+video::ITexture * MaterialItem::getImage() const
+{
+       return content_features(m_content).inventory_texture;
+}
+#endif
+
 bool MaterialItem::isCookable() const
 {
        return item_material_is_cookable(m_content);
@@ -205,22 +213,23 @@ InventoryItem *CraftItem::createCookResult() const
        return item_craft_create_cook_result(m_subname);
 }
 
-bool CraftItem::use(ServerEnvironment *env, Player *player)
+bool CraftItem::use(ServerEnvironment *env, ServerActiveObject *user)
 {
-       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;
+       if(!item_craft_is_eatable(m_subname))
+               return false;
+       
+       u16 result_count = getCount() - 1; // Eat one at a time
+       s16 hp_change = item_craft_eat_hp_change(m_subname);
+       s16 hp = user->getHP();
+       hp += hp_change;
+       if(hp < 0)
+               hp = 0;
+       user->setHP(hp);
+       
+       if(result_count < 1)
+               return true;
                
-               if(result_count < 1)
-                       return true;
-               else
-                       setCount(result_count);
-       }
+       setCount(result_count);
        return false;
 }