--- deliantra/server/common/treasure.C 2012/10/29 23:55:52 1.116 +++ deliantra/server/common/treasure.C 2018/11/17 23:40:00 1.121 @@ -1,7 +1,8 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002 Mark Wedel & Crossfire Development Team * Copyright (©) 1992 Frank Tore Johansen * @@ -36,18 +37,20 @@ #include #include +#include + extern char *spell_mapping[]; static treasurelist *first_treasurelist; static void change_treasure (treasure *t, object *op); /* overrule default values */ -typedef std::tr1::unordered_map< - const char *, - treasurelist *, - str_hash, - str_equal, - slice_allocator< std::pair > +typedef ska::flat_hash_map< + const char *, + treasurelist *, + str_hash, + str_equal, + slice_allocator< std::pair > > tl_map_t; static tl_map_t tl_map; @@ -492,7 +495,7 @@ { 0, 0, 0, 0, 100}, // 31 }; -/* calculate the appropriate level for wands staves and scrolls. +/* calculate the appropriate level for wands staves and scrolls. * This code presumes that op has had its spell object created (in op->inv) * * elmex Wed Aug 9 17:44:59 CEST 2006: @@ -810,8 +813,8 @@ */ /* 4/28/96 added creator object from which op may now inherit properties based on - * op->type. Right now, which stuff the creator passes on is object type - * dependant. I know this is a spagetti manuever, but is there a cleaner + * op->type. Right now, which stuff the creator passes on is object type + * dependant. I know this is a spagetti manuever, but is there a cleaner * way to do this? b.t. */ /*