diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-06-18 02:30:33 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-18 02:30:33 +0300 |
commit | cced6aaf8db60e4a28e290f4ca235661037193aa (patch) | |
tree | 8aab72e6cddbc9f6e1f11fc1eec1d4d937165cb4 /src/inventory.cpp | |
parent | a23f6a1548147102a3ddbe044b27c02eaaae059d (diff) | |
download | minetest-cced6aaf8db60e4a28e290f4ca235661037193aa.tar.gz minetest-cced6aaf8db60e4a28e290f4ca235661037193aa.tar.bz2 minetest-cced6aaf8db60e4a28e290f4ca235661037193aa.zip |
separated inventory-related game content to content_inventory.{h,cpp}
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r-- | src/inventory.cpp | 77 |
1 files changed, 14 insertions, 63 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 88453530e..03df98de6 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" #include "serverobject.h" #include "content_mapnode.h" +#include "content_inventory.h" /* InventoryItem @@ -111,36 +112,12 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f bool MaterialItem::isCookable() { - if(m_content == CONTENT_TREE) - { - return true; - } - else if(m_content == CONTENT_COBBLE) - { - return true; - } - else if(m_content == CONTENT_SAND) - { - return true; - } - return false; + return item_material_is_cookable(m_content); } InventoryItem *MaterialItem::createCookResult() { - if(m_content == CONTENT_TREE) - { - return new CraftItem("lump_of_coal", 1); - } - else if(m_content == CONTENT_COBBLE) - { - return new MaterialItem(CONTENT_STONE, 1); - } - else if(m_content == CONTENT_SAND) - { - return new MaterialItem(CONTENT_GLASS, 1); - } - return NULL; + return item_material_create_cook_result(m_content); } /* @@ -153,21 +130,8 @@ video::ITexture * CraftItem::getImage() if(g_texturesource == NULL) return NULL; - std::string name; + std::string name = item_craft_get_image_name(m_subname); - if(m_subname == "Stick") - name = "stick.png"; - else if(m_subname == "lump_of_coal") - name = "lump_of_coal.png"; - else if(m_subname == "lump_of_iron") - name = "lump_of_iron.png"; - else if(m_subname == "steel_ingot") - name = "steel_ingot.png"; - else if(m_subname == "rat") - name = "rat.png"; - else - name = "cloud.png"; - // Get such a texture return g_texturesource->getTextureRaw(name); } @@ -176,48 +140,35 @@ video::ITexture * CraftItem::getImage() ServerActiveObject* CraftItem::createSAO(ServerEnvironment *env, u16 id, v3f pos) { // Special cases - if(m_subname == "rat") - { - ServerActiveObject *obj = new RatSAO(env, id, pos); + ServerActiveObject *obj = item_craft_create_object(m_subname, env, id, pos); + if(obj) return obj; - } // Default - else - { - return InventoryItem::createSAO(env, id, pos); - } + return InventoryItem::createSAO(env, id, pos); } u16 CraftItem::getDropCount() { // Special cases - if(m_subname == "rat") - return 1; + s16 dc = item_craft_get_drop_count(m_subname); + if(dc != -1) + return dc; // Default - else - return InventoryItem::getDropCount(); + return InventoryItem::getDropCount(); } bool CraftItem::isCookable() { - if(m_subname == "lump_of_iron") - { - return true; - } - return false; + return item_craft_is_cookable(m_subname); } InventoryItem *CraftItem::createCookResult() { - if(m_subname == "lump_of_iron") - { - return new CraftItem("steel_ingot", 1); - } - return NULL; + return item_craft_create_cook_result(m_subname); } /* - MapBlockObjectItem + MapBlockObjectItem DEPRECATED TODO: Remove */ #ifndef SERVER |