From dc5319b6c9f2e39d93f2fa881403f36fc47ffaac Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 17 Jun 2011 22:20:15 +0300 Subject: Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp} --- src/inventory.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/inventory.cpp') diff --git a/src/inventory.cpp b/src/inventory.cpp index 47a8d4de9..88453530e 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include "main.h" #include "serverobject.h" +#include "content_mapnode.h" /* InventoryItem -- cgit v1.2.3 From cced6aaf8db60e4a28e290f4ca235661037193aa Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 18 Jun 2011 02:30:33 +0300 Subject: separated inventory-related game content to content_inventory.{h,cpp} --- src/inventory.cpp | 77 ++++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 63 deletions(-) (limited to 'src/inventory.cpp') 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 -- cgit v1.2.3 From 748340fad59abc6da2369455c268d6a66c738e69 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 19 Jun 2011 19:40:41 +0300 Subject: fixed a segfault in case of wrong input from network on the server (reported by spongie) --- src/inventory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/inventory.cpp') diff --git a/src/inventory.cpp b/src/inventory.cpp index 03df98de6..0c76ed845 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -470,7 +470,7 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem) //setDirty(true); // If it is an empty position, it's an easy job. - InventoryItem *to_item = m_items[i]; + InventoryItem *to_item = getItem(i); if(to_item == NULL) { m_items[i] = newitem; @@ -502,7 +502,7 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem) bool InventoryList::itemFits(u32 i, InventoryItem *newitem) { // If it is an empty position, it's an easy job. - InventoryItem *to_item = m_items[i]; + InventoryItem *to_item = getItem(i); if(to_item == NULL) { return true; @@ -528,7 +528,7 @@ InventoryItem * InventoryList::takeItem(u32 i, u32 count) //setDirty(true); - InventoryItem *item = m_items[i]; + InventoryItem *item = getItem(i); // If it is an empty position, return NULL if(item == NULL) return NULL; -- cgit v1.2.3