X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fitemgroup.h;h=fcf72064979bcc600b7254e13719c194c17bac72;hb=7c43cf47c37b0204e34d12670d2e6975eb36b45a;hp=3a07e9e022a986e1e54a6d2184dd97a37eeb06dd;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=oweals%2Fminetest.git diff --git a/src/itemgroup.h b/src/itemgroup.h index 3a07e9e02..fcf720649 100644 --- a/src/itemgroup.h +++ b/src/itemgroup.h @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2012 celeron55, Perttu Ahola +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -17,23 +17,17 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef ITEMGROUP_HEADER -#define ITEMGROUP_HEADER +#pragma once -#include "irrlichttypes_extrabloated.h" #include -#include +#include -typedef std::map ItemGroupList; +typedef std::unordered_map 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) { - std::map::const_iterator i = groups.find(name); - if(i == groups.end()) + ItemGroupList::const_iterator i = groups.find(name); + if (i == groups.end()) return 0; return i->second; } - -#endif -