diff options
| author | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
|---|---|---|
| committer | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
| commit | 63fe487d933f00123bb97d699c98e0c5248a8060 (patch) | |
| tree | 446356ce6e66ccc76675eff0648d75c7e05ce2b4 /src/inventory.cpp | |
| parent | d2b2c7c09e21fcf728e741e11e6fdabe03036b0e (diff) | |
| parent | c930a92b7222e0228332fb39536d7ff4f3442d1b (diff) | |
| download | minetest-63fe487d933f00123bb97d699c98e0c5248a8060.tar.gz minetest-63fe487d933f00123bb97d699c98e0c5248a8060.tar.bz2 minetest-63fe487d933f00123bb97d699c98e0c5248a8060.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 47a8d4de9..3f83c7419 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -160,8 +160,12 @@ video::ITexture * CraftItem::getImage() name = "lump_of_coal.png"; else if(m_subname == "lump_of_iron") name = "lump_of_iron.png"; + else if(m_subname == "lump_of_clay") + name = "lump_of_clay.png"; else if(m_subname == "steel_ingot") name = "steel_ingot.png"; + else if(m_subname == "clay_brick") + name = "clay_brick.png"; else if(m_subname == "rat") name = "rat.png"; else @@ -199,7 +203,7 @@ u16 CraftItem::getDropCount() bool CraftItem::isCookable() { - if(m_subname == "lump_of_iron") + if(m_subname == "lump_of_iron" || m_subname == "lump_of_clay") { return true; } @@ -212,6 +216,8 @@ InventoryItem *CraftItem::createCookResult() { return new CraftItem("steel_ingot", 1); } + else if(m_subname == "lump_of_clay") + return new CraftItem("clay_brick", 1); return NULL; } |