diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:46:55 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:47:55 +0200 |
| commit | 96bee29e35f0790657fbd8bb67d2af79b498255c (patch) | |
| tree | 0712c75629ab16fad84af11050ef94d8c8ac8137 /src/content_nodemeta.cpp | |
| parent | 82ea53499710c9a4e92ec595d8c14c417bdd0ee6 (diff) | |
| parent | f2051c98223d087c8ba3d7e4514935781c93ed1c (diff) | |
| download | minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.gz minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.bz2 minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.zip | |
Merge branch 'upstream/master'
Diffstat (limited to 'src/content_nodemeta.cpp')
| -rw-r--r-- | src/content_nodemeta.cpp | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index 681e2b925..6b8bf05ef 100644 --- a/src/content_nodemeta.cpp +++ b/src/content_nodemeta.cpp @@ -277,6 +277,20 @@ bool FurnaceNodeMetadata::step(float dtime) 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; @@ -284,6 +298,41 @@ bool FurnaceNodeMetadata::step(float dtime) fuel_list->decrementMaterials(1); changed = true; } + else if(ItemSpec(ITEM_MATERIAL, CONTENT_BOOKSHELF).checkItem(fuel_item)) + { + m_fuel_totaltime = 30/4; + 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; |