ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/treasure.C
(Generate patch)

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.110 by elmex, Wed May 5 09:42:52 2010 UTC vs.
Revision 1.120 by root, Sat Nov 17 23:33:17 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
… …
34//#define TREASURE_VERBOSE 34//#define TREASURE_VERBOSE
35 35
36#include <global.h> 36#include <global.h>
37#include <treasure.h> 37#include <treasure.h>
38 38
39#include <flat_hash_map.hpp>
40
39extern char *spell_mapping[]; 41extern char *spell_mapping[];
40 42
41static treasurelist *first_treasurelist; 43static treasurelist *first_treasurelist;
42 44
43static void change_treasure (treasure *t, object *op); /* overrule default values */ 45static void change_treasure (treasure *t, object *op); /* overrule default values */
44 46
45typedef std::tr1::unordered_map< 47typedef ska::flat_hash_map<
46 const char *, 48 const char *,
47 treasurelist *, 49 treasurelist *,
48 str_hash, 50 str_hash,
49 str_equal, 51 str_equal,
50 slice_allocator< std::pair<const char *const, treasurelist *> > 52 slice_allocator< std::pair<const char *const, treasurelist *> >
51> tl_map_t; 53> tl_map_t;
52 54
53static tl_map_t tl_map; 55static tl_map_t tl_map;
54 56
55//TODO: class method 57//TODO: class method
… …
490 { 0, 0, 0, 3, 97}, // 29 492 { 0, 0, 0, 3, 97}, // 29
491 { 0, 0, 0, 0, 100}, // 30 493 { 0, 0, 0, 0, 100}, // 30
492 { 0, 0, 0, 0, 100}, // 31 494 { 0, 0, 0, 0, 100}, // 31
493}; 495};
494 496
495/* calculate the appropriate level for wands staves and scrolls. 497/* calculate the appropriate level for wands staves and scrolls.
496 * This code presumes that op has had its spell object created (in op->inv) 498 * This code presumes that op has had its spell object created (in op->inv)
497 * 499 *
498 * elmex Wed Aug 9 17:44:59 CEST 2006: 500 * elmex Wed Aug 9 17:44:59 CEST 2006:
499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 501 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
500 */ 502 */
… …
808 * order to set it up right. This produced magical bonuses, puts spells 810 * order to set it up right. This produced magical bonuses, puts spells
809 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 811 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
810 */ 812 */
811 813
812/* 4/28/96 added creator object from which op may now inherit properties based on 814/* 4/28/96 added creator object from which op may now inherit properties based on
813 * op->type. Right now, which stuff the creator passes on is object type 815 * op->type. Right now, which stuff the creator passes on is object type
814 * dependant. I know this is a spagetti manuever, but is there a cleaner 816 * dependant. I know this is a spagetti manuever, but is there a cleaner
815 * way to do this? b.t. */ 817 * way to do this? b.t. */
816 818
817/* 819/*
818 * ! (flags & GT_ENVIRONMENT): 820 * ! (flags & GT_ENVIRONMENT):
819 * Automatically calls fix_flesh_item(). 821 * Automatically calls fix_flesh_item().
… …
919 { 921 {
920 if (op->type == POTION) 922 if (op->type == POTION)
921 /* Handle healing and magic power potions */ 923 /* Handle healing and magic power potions */
922 if (op->stats.sp && !op->randomitems) 924 if (op->stats.sp && !op->randomitems)
923 { 925 {
924 object *tmp = get_archetype (spell_mapping [op->stats.sp]); 926 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
925 insert_ob_in_ob (tmp, op); 927 insert_ob_in_ob (tmp, op);
926 op->stats.sp = 0; 928 op->stats.sp = 0;
927 } 929 }
928 } 930 }
929 else if (!op->title) /* Only modify object if not special */ 931 else if (!op->title) /* Only modify object if not special */
… …
947 } 949 }
948 break; 950 break;
949 951
950 case POTION: 952 case POTION:
951 { 953 {
952 int too_many_tries = 0, is_special = 0; 954 int too_many_tries = 0;
953 955
954 /* Handle healing and magic power potions */ 956 /* Handle healing and magic power potions */
955 if (op->stats.sp && !op->randomitems) 957 if (op->stats.sp && !op->randomitems)
956 { 958 {
957 object *tmp = get_archetype (spell_mapping[op->stats.sp]); 959 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
958 insert_ob_in_ob (tmp, op); 960 insert_ob_in_ob (tmp, op);
959 op->stats.sp = 0; 961 op->stats.sp = 0;
960 } 962 }
961 963
962 while (!(is_special = special_potion (op)) && !op->inv) 964 while (!special_potion (op) && !op->inv)
963 { 965 {
964 generate_artifact (op, difficulty); 966 generate_artifact (op, difficulty);
965 if (too_many_tries++ > 10) 967 if (too_many_tries++ > 10)
966 break; 968 break;
967 } 969 }
… …
1489 name = tmp->name + 1, neg = 1; 1491 name = tmp->name + 1, neg = 1;
1490 else 1492 else
1491 name = tmp->name, neg = 0; 1493 name = tmp->name, neg = 0;
1492 1494
1493 /* If we match name, then return the opposite of 'neg' */ 1495 /* If we match name, then return the opposite of 'neg' */
1494 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) 1496 if (!strcmp (name, op->arch->archname))
1495 return !neg; 1497 return !neg;
1496 1498
1497 /* Set success as true, since if the match was an inverse, it means 1499 /* Set success as true, since if the match was an inverse, it means
1498 * everything is allowed except what we match 1500 * everything is allowed except what we match
1499 */ 1501 */

Diff Legend

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