diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/itemgroup.h | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/itemgroup.h')
| -rw-r--r-- | src/itemgroup.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/itemgroup.h b/src/itemgroup.h index f91ccc221..2206857fd 100644 --- a/src/itemgroup.h +++ b/src/itemgroup.h @@ -25,14 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc., typedef UNORDERED_MAP<std::string, int> ItemGroupList; -static inline int itemgroup_get(const ItemGroupList &groups, - const std::string &name) +static inline int itemgroup_get(const ItemGroupList &groups, const std::string &name) { ItemGroupList::const_iterator i = groups.find(name); - if(i == groups.end()) + if (i == groups.end()) return 0; return i->second; } #endif - |