[ViewVC] Diff of: cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.110 by elmex, Wed May 5 09:42:52 2010 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / 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
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* TREASURE_DEBUG does some checking on the treasurelists after loading.
  * It is useful for finding bugs in the treasures file.  Since it only
 //#define TREASURE_VERBOSE
 #include <global.h>
 #include <treasure.h>
+#include <flat_hash_map.hpp>
+// used only by treasure.C, does not handle null arch ptrs
+#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
 extern char *spell_mapping[];
 static treasurelist *first_treasurelist;
 static void change_treasure (treasure *t, object *op);  /* overrule default values */
-typedef std::tr1::unordered_map<
+typedef ska::flat_hash_map<
-   const char *,
+  const char *,
-   treasurelist *,
+  treasurelist *,
-   str_hash,
+  str_hash,
-   str_equal,
+  str_equal,
-   slice_allocator< std::pair<const char *const, treasurelist *> >
+  slice_allocator< std::pair<const char *const, treasurelist *> >
 > tl_map_t;
 static tl_map_t tl_map;
 //TODO: class method
   { 0,  0,  0,  3,  97}, // 29
   { 0,  0,  0,  0, 100}, // 30
   { 0,  0,  0,  0, 100}, // 31
 };
 /* 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:
  *        Removed multiplicator, too many high-level items were generated on low-difficulty maps.
  */
  * order to set it up right.  This produced magical bonuses, puts spells
  * into scrolls/books/wands, makes it unidentified, hides the value, etc.
  */
 /* 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
  * way to do this? b.t. */
 /*
  * ! (flags & GT_ENVIRONMENT):
  *     Automatically calls fix_flesh_item().
     {
       if (op->type == POTION)
         /* Handle healing and magic power potions */
         if (op->stats.sp && !op->randomitems)
           {
-            object *tmp = get_archetype (spell_mapping [op->stats.sp]);
+            object *tmp = archetype::get (spell_mapping [op->stats.sp]);
             insert_ob_in_ob (tmp, op);
             op->stats.sp = 0;
           }
     }
   else if (!op->title)          /* Only modify object if not special */
               }
             break;
           case POTION:
             {
-              int too_many_tries = 0, is_special = 0;
+              int too_many_tries = 0;
               /* Handle healing and magic power potions */
               if (op->stats.sp && !op->randomitems)
                 {
-                  object *tmp = get_archetype (spell_mapping[op->stats.sp]);
+                  object *tmp = archetype::get (spell_mapping[op->stats.sp]);
                   insert_ob_in_ob (tmp, op);
                   op->stats.sp = 0;
                 }
-              while (!(is_special = special_potion (op)) && !op->inv)
+              while (!special_potion (op) && !op->inv)
                 {
                   generate_artifact (op, difficulty);
                   if (too_many_tries++ > 10)
                     break;
                 }
         name = tmp->name + 1, neg = 1;
       else
         name = tmp->name, neg = 0;
       /* If we match name, then return the opposite of 'neg' */
-      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
+      if (!strcmp (name, op->arch->archname))
         return !neg;
       /* Set success as true, since if the match was an inverse, it means
        * everything is allowed except what we match
        */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.110 by elmex, Wed May 5 09:42:52 2010 UTC vs. Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.110 by elmex, Wed May 5 09:42:52 2010 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC