diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-08-30 14:24:07 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-30 14:24:07 +0300 |
| commit | 87b9e5467d50ba243e4b0cb63f6be206ef107f7b (patch) | |
| tree | 4b869ce85509c1c1ba7ac666c92588a3716b9e68 /src/inventory.h | |
| parent | 625dac8d8c84e8952fb9bf3f80c8efed7b2b4fa0 (diff) | |
| parent | 134e49cc8e442e582608411832363e15f68ea6eb (diff) | |
| download | minetest-87b9e5467d50ba243e4b0cb63f6be206ef107f7b.tar.gz minetest-87b9e5467d50ba243e4b0cb63f6be206ef107f7b.tar.bz2 minetest-87b9e5467d50ba243e4b0cb63f6be206ef107f7b.zip | |
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/inventory.h b/src/inventory.h index 9c2027a53..b19a365c8 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -490,7 +490,13 @@ public: InventoryItem * addItem(u32 i, InventoryItem *newitem); // Checks whether the item could be added to the given slot - bool itemFits(u32 i, InventoryItem *newitem); + bool itemFits(const u32 i, const InventoryItem *newitem); + + // Checks whether there is room for a given item + bool roomForItem(const InventoryItem *item); + + // Checks whether there is room for a given item aftr it has been cooked + bool roomForCookedItem(const InventoryItem *item); // Takes some items from a slot. // If there are not enough, takes as many as it can. |