summaryrefslogtreecommitdiff
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-05-09 21:41:16 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-05-09 21:41:16 +0300
commit0674db4a6b687a73637844fa354d2ac662e42820 (patch)
tree0fd303ffdbca9d1a7c60c13c3ca4aeddd28c7c57 /src/inventory.cpp
parent8c3b4fed10ce5bad422436b8b804fd1fd71b0e65 (diff)
parent2c4eb198c37a3b6cc63a277916139c94922e442f (diff)
downloadminetest-0674db4a6b687a73637844fa354d2ac662e42820.tar.gz
minetest-0674db4a6b687a73637844fa354d2ac662e42820.tar.bz2
minetest-0674db4a6b687a73637844fa354d2ac662e42820.zip
merged CiaranG's changes: the glass block
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r--src/inventory.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index f91e2e0b6..47a8d4de9 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -118,6 +118,10 @@ bool MaterialItem::isCookable()
{
return true;
}
+ else if(m_content == CONTENT_SAND)
+ {
+ return true;
+ }
return false;
}
@@ -131,6 +135,10 @@ InventoryItem *MaterialItem::createCookResult()
{
return new MaterialItem(CONTENT_STONE, 1);
}
+ else if(m_content == CONTENT_SAND)
+ {
+ return new MaterialItem(CONTENT_GLASS, 1);
+ }
return NULL;
}