Falling sand and gravel

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

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index adaee33b4a792c128bcda00dcbfa49e90baebd64..ab98496688bfbf6956d513e60a8096dabfb638d9 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -19,8 +19,13 @@ 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
@@ -37,7 +42,7 @@ SignNodeMetadata::SignNodeMetadata(IGameDef *gamedef, std::string text):
 }
 u16 SignNodeMetadata::typeId() const
 {
-       return CONTENT_SIGN_WALL;
+       return NODEMETA_SIGN;
 }
 NodeMetadata* SignNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
@@ -78,7 +83,7 @@ ChestNodeMetadata::~ChestNodeMetadata()
 }
 u16 ChestNodeMetadata::typeId() const
 {
-       return CONTENT_CHEST;
+       return NODEMETA_CHEST;
 }
 NodeMetadata* ChestNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
@@ -141,7 +146,7 @@ LockingChestNodeMetadata::~LockingChestNodeMetadata()
 }
 u16 LockingChestNodeMetadata::typeId() const
 {
-       return CONTENT_LOCKABLE_CHEST;
+       return NODEMETA_LOCKABLE_CHEST;
 }
 NodeMetadata* LockingChestNodeMetadata::create(std::istream &is, IGameDef *gamedef)
 {
@@ -214,7 +219,7 @@ FurnaceNodeMetadata::~FurnaceNodeMetadata()
 }
 u16 FurnaceNodeMetadata::typeId() const
 {
-       return CONTENT_FURNACE;
+       return NODEMETA_FURNACE;
 }
 NodeMetadata* FurnaceNodeMetadata::clone(IGameDef *gamedef)
 {
@@ -325,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
                {
@@ -380,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;