Falling sand and gravel

[oweals/minetest.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index e6138a4010d6c39a677ab2513d7e55887eefa19b..ab98496688bfbf6956d513e60a8096dabfb638d9 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -19,33 +19,39 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "content_nodemeta.h"
 #include "inventory.h"
-#include "content_mapnode.h"
 #include "log.h"
+#include "utility.h"
+
+#define NODEMETA_SIGN 14
+#define NODEMETA_CHEST 15
+#define NODEMETA_LOCKABLE_CHEST 17
+#define NODEMETA_FURNACE 16
 
 /*
        SignNodeMetadata
 */
 
 // Prototype
-SignNodeMetadata proto_SignNodeMetadata("");
+SignNodeMetadata proto_SignNodeMetadata(NULL, "");
 
-SignNodeMetadata::SignNodeMetadata(std::string text):
+SignNodeMetadata::SignNodeMetadata(IGameDef *gamedef, std::string text):
+       NodeMetadata(gamedef),
        m_text(text)
 {
        NodeMetadata::registerType(typeId(), create);
 }
 u16 SignNodeMetadata::typeId() const
 {
-       return CONTENT_SIGN_WALL;
+       return NODEMETA_SIGN;
 }
-NodeMetadata* SignNodeMetadata::create(std::istream &is)
+NodeMetadata* SignNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
        std::string text = deSerializeString(is);
-       return new SignNodeMetadata(text);
+       return new SignNodeMetadata(gamedef, text);
 }
-NodeMetadata* SignNodeMetadata::clone()
+NodeMetadata* SignNodeMetadata::clone(IGameDef *gamedef)
 {
-       return new SignNodeMetadata(m_text);
+       return new SignNodeMetadata(gamedef, m_text);
 }
 void SignNodeMetadata::serializeBody(std::ostream &os)
 {
@@ -61,9 +67,10 @@ std::string SignNodeMetadata::infoText()
 */
 
 // Prototype
-ChestNodeMetadata proto_ChestNodeMetadata;
+ChestNodeMetadata proto_ChestNodeMetadata(NULL);
 
-ChestNodeMetadata::ChestNodeMetadata()
+ChestNodeMetadata::ChestNodeMetadata(IGameDef *gamedef):
+       NodeMetadata(gamedef)
 {
        NodeMetadata::registerType(typeId(), create);
        
@@ -76,17 +83,17 @@ ChestNodeMetadata::~ChestNodeMetadata()
 }
 u16 ChestNodeMetadata::typeId() const
 {
-       return CONTENT_CHEST;
+       return NODEMETA_CHEST;
 }
-NodeMetadata* ChestNodeMetadata::create(std::istream &is)
+NodeMetadata* ChestNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
-       ChestNodeMetadata *d = new ChestNodeMetadata();
-       d->m_inventory->deSerialize(is);
+       ChestNodeMetadata *d = new ChestNodeMetadata(gamedef);
+       d->m_inventory->deSerialize(is, gamedef);
        return d;
 }
-NodeMetadata* ChestNodeMetadata::clone()
+NodeMetadata* ChestNodeMetadata::clone(IGameDef *gamedef)
 {
-       ChestNodeMetadata *d = new ChestNodeMetadata();
+       ChestNodeMetadata *d = new ChestNodeMetadata(gamedef);
        *d->m_inventory = *m_inventory;
        return d;
 }
@@ -123,9 +130,10 @@ std::string ChestNodeMetadata::getInventoryDrawSpecString()
 */
 
 // Prototype
-LockingChestNodeMetadata proto_LockingChestNodeMetadata;
+LockingChestNodeMetadata proto_LockingChestNodeMetadata(NULL);
 
-LockingChestNodeMetadata::LockingChestNodeMetadata()
+LockingChestNodeMetadata::LockingChestNodeMetadata(IGameDef *gamedef):
+       NodeMetadata(gamedef)
 {
        NodeMetadata::registerType(typeId(), create);
 
@@ -138,18 +146,18 @@ LockingChestNodeMetadata::~LockingChestNodeMetadata()
 }
 u16 LockingChestNodeMetadata::typeId() const
 {
-       return CONTENT_LOCKABLE_CHEST;
+       return NODEMETA_LOCKABLE_CHEST;
 }
-NodeMetadata* LockingChestNodeMetadata::create(std::istream &is)
+NodeMetadata* LockingChestNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
-       LockingChestNodeMetadata *d = new LockingChestNodeMetadata();
+       LockingChestNodeMetadata *d = new LockingChestNodeMetadata(gamedef);
        d->setOwner(deSerializeString(is));
-       d->m_inventory->deSerialize(is);
+       d->m_inventory->deSerialize(is, gamedef);
        return d;
 }
-NodeMetadata* LockingChestNodeMetadata::clone()
+NodeMetadata* LockingChestNodeMetadata::clone(IGameDef *gamedef)
 {
-       LockingChestNodeMetadata *d = new LockingChestNodeMetadata();
+       LockingChestNodeMetadata *d = new LockingChestNodeMetadata(gamedef);
        *d->m_inventory = *m_inventory;
        return d;
 }
@@ -187,9 +195,10 @@ std::string LockingChestNodeMetadata::getInventoryDrawSpecString()
 */
 
 // Prototype
-FurnaceNodeMetadata proto_FurnaceNodeMetadata;
+FurnaceNodeMetadata proto_FurnaceNodeMetadata(NULL);
 
-FurnaceNodeMetadata::FurnaceNodeMetadata()
+FurnaceNodeMetadata::FurnaceNodeMetadata(IGameDef *gamedef):
+       NodeMetadata(gamedef)
 {
        NodeMetadata::registerType(typeId(), create);
        
@@ -210,19 +219,19 @@ FurnaceNodeMetadata::~FurnaceNodeMetadata()
 }
 u16 FurnaceNodeMetadata::typeId() const
 {
-       return CONTENT_FURNACE;
+       return NODEMETA_FURNACE;
 }
-NodeMetadata* FurnaceNodeMetadata::clone()
+NodeMetadata* FurnaceNodeMetadata::clone(IGameDef *gamedef)
 {
-       FurnaceNodeMetadata *d = new FurnaceNodeMetadata();
+       FurnaceNodeMetadata *d = new FurnaceNodeMetadata(m_gamedef);
        *d->m_inventory = *m_inventory;
        return d;
 }
-NodeMetadata* FurnaceNodeMetadata::create(std::istream &is)
+NodeMetadata* FurnaceNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
-       FurnaceNodeMetadata *d = new FurnaceNodeMetadata();
+       FurnaceNodeMetadata *d = new FurnaceNodeMetadata(gamedef);
 
-       d->m_inventory->deSerialize(is);
+       d->m_inventory->deSerialize(is, gamedef);
 
        int temp;
        is>>temp;
@@ -321,7 +330,7 @@ bool FurnaceNodeMetadata::step(float dtime)
                // accomodate any result item
                if(room_available)
                {
-                       m_src_totaltime = 3;
+                       m_src_totaltime = src_item->getCookTime();
                }
                else
                {
@@ -376,85 +385,12 @@ bool FurnaceNodeMetadata::step(float dtime)
                assert(fuel_list);
                const InventoryItem *fuel_item = fuel_list->getItem(0);
 
-               if(ItemSpec(ITEM_MATERIAL, CONTENT_TREE).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_JUNGLETREE).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_FENCE).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/2;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_WOOD).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/4;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_BOOKSHELF).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/4;
+               if(fuel_item && fuel_item->getBurnTime() >= 0){
+                       m_fuel_totaltime = fuel_item->getBurnTime();
                        m_fuel_time = 0;
                        fuel_list->decrementMaterials(1);
                        changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_LEAVES).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/16;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_PAPYRUS).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/32;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_JUNGLEGRASS).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/32;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_MATERIAL, CONTENT_CACTUS).checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/4;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_CRAFT, "Stick").checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 30/4/4;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else if(ItemSpec(ITEM_CRAFT, "lump_of_coal").checkItem(fuel_item))
-               {
-                       m_fuel_totaltime = 40;
-                       m_fuel_time = 0;
-                       fuel_list->decrementMaterials(1);
-                       changed = true;
-               }
-               else
-               {
+               } else {
                        //infostream<<"No fuel found"<<std::endl;
                        // No fuel, stop loop.
                        m_step_accumulator = 0;