diff options
| author | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
| commit | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (patch) | |
| tree | 1e9ef1be1b3295a8673d6e4f0bdeb4c2d3a6015f /src/inventory.h | |
| parent | 8077612dcb48221281e726a60eb97bf73fde462b (diff) | |
| parent | 231ac33d34dfaaddf292c5f31b1eae43eeefba2d (diff) | |
| download | minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.gz minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.bz2 minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.zip | |
Merge 0.4.15 changes into stable-0.4
0.4.15 release!
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/inventory.h b/src/inventory.h index a690eb5ae..7d7e58d61 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -80,15 +80,14 @@ struct ItemStack // Maximum size of a stack u16 getStackMax(IItemDefManager *itemdef) const { - s16 max = itemdef->get(name).stack_max; - return (max >= 0) ? max : 0; + return itemdef->get(name).stack_max; } // Number of items that can be added to this stack u16 freeSpace(IItemDefManager *itemdef) const { u16 max = getStackMax(itemdef); - if(count > max) + if (count >= max) return 0; return max - count; } |