--- deliantra/server/common/item.C 2010/04/30 20:43:17 1.86 +++ deliantra/server/common/item.C 2010/04/30 21:13:41 1.87 @@ -355,16 +355,28 @@ return get_power_from_ench (enc); } +static const struct get_typedata +{ + const typedata *data [NUM_TYPES]; + + get_typedata () + { + for (int i = 0; i < item_types_size; i++) + data [item_types[i].number] = &item_types [i]; + } + + const typedata *operator ()(int itemtype) const + { + return data [itemtype]; + } +} get_typedata_; + /* returns the typedata that has a number equal to itemtype, if there * isn't one, returns NULL */ const typedata * get_typedata (int itemtype) { - for (int i = 0; i < item_types_size; i++) - if (item_types[i].number == itemtype) - return &item_types[i]; - - return NULL; + return get_typedata_ (itemtype); } /* returns the typedata that has a name equal to itemtype, if there