summaryrefslogtreecommitdiff
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authorJacobF <queatz@gmail.com>2011-09-02 16:59:17 -0400
committerJacobF <queatz@gmail.com>2011-09-02 16:59:17 -0400
commite3c58eff1c0a0650c3ab4df76cd6941741e727f6 (patch)
treef74b23615fc5bf46ef155304d6b9dc2ede9d296a /src/inventory.cpp
parent99de37ff9461b36b8686564d968ede68ef30000d (diff)
parentad795c9f0c309d6d50b5679026690b055afe4a7c (diff)
downloadminetest-e3c58eff1c0a0650c3ab4df76cd6941741e727f6.tar.gz
minetest-e3c58eff1c0a0650c3ab4df76cd6941741e727f6.tar.bz2
minetest-e3c58eff1c0a0650c3ab4df76cd6941741e727f6.zip
Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r--src/inventory.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 62aedb536..116ceeb6d 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -581,6 +581,8 @@ bool InventoryList::roomForItem(const InventoryItem *item)
bool InventoryList::roomForCookedItem(const InventoryItem *item)
{
+ if(!item)
+ return false;
const InventoryItem *cook = item->createCookResult();
if(!cook)
return false;