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.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.109 by root, Sun May 2 20:37:57 2010 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 (at your 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 GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23*/ 23 */
24
25#define ALLOWED_COMBINATION
26 24
27/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28 * 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
29 * slows the startup some (and not actual game play), it is by default 27 * slows the startup some (and not actual game play), it is by default
30 * left on 28 * left on
31 */ 29 */
32#define TREASURE_DEBUG 30#define TREASURE_DEBUG
33 31
34/* TREASURE_VERBOSE enables copious output concerning artifact generation */ 32/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35 33
36/* #define TREASURE_VERBOSE */ 34//#define TREASURE_VERBOSE
37 35
38#include <global.h> 36#include <global.h>
39#include <treasure.h> 37#include <treasure.h>
40#include <funcpoint.h>
41#include <loader.h>
42 38
39extern char *spell_mapping[];
40
41static treasurelist *first_treasurelist;
43 42
44static void change_treasure (treasure *t, object *op); /* overrule default values */ 43static void change_treasure (treasure *t, object *op); /* overrule default values */
45extern char *spell_mapping[];
46 44
47/* 45typedef std::tr1::unordered_map<
48 * Initialize global archtype pointers: 46 const char *,
49 */ 47 treasurelist *,
48 str_hash,
49 str_equal,
50 slice_allocator< std::pair<const char *const, treasurelist *> >
51> tl_map_t;
50 52
51void 53static tl_map_t tl_map;
52init_archetype_pointers ()
53{
54 int prev_warn = warn_archetypes;
55 54
56 warn_archetypes = 1; 55//TODO: class method
57 if (ring_arch == NULL) 56static void free_treasurestruct (treasure *t); // bleh desu
58 ring_arch = archetype::find ("ring"); 57static void
59 if (amulet_arch == NULL) 58clear (treasurelist *tl)
60 amulet_arch = archetype::find ("amulet"); 59{
61 if (staff_arch == NULL) 60 if (tl->items)
62 staff_arch = archetype::find ("staff"); 61 {
63 if (crown_arch == NULL) 62 free_treasurestruct (tl->items);
64 crown_arch = archetype::find ("crown"); 63 tl->items = 0;
65 warn_archetypes = prev_warn; 64 }
66}
67 65
68/* 66 tl->total_chance = 0;
69 * Allocate and return the pointer to an empty treasurelist structure. 67}
70 */
71 68
69/*
70 * Searches for the given treasurelist
71 */
72static treasurelist * 72treasurelist *
73get_empty_treasurelist (void) 73treasurelist::find (const char *name)
74{ 74{
75 if (!name)
76 return 0;
77
78 auto (i, tl_map.find (name));
79
80 if (i == tl_map.end ())
81 return 0;
82
83 return i->second;
84}
85
86/*
87 * Searches for the given treasurelist in the globally linked list
88 * of treasurelists which has been built by load_treasures().
89 */
90treasurelist *
91treasurelist::get (const char *name)
92{
93 treasurelist *tl = find (name);
94
95 if (!tl)
96 {
75 return new treasurelist; 97 tl = new treasurelist;
76}
77 98
78/* 99 tl->name = name;
79 * Allocate and return the pointer to an empty treasure structure. 100 tl->next = first_treasurelist;
80 */ 101 first_treasurelist = tl;
81//TODO: make this a constructor
82static treasure *
83get_empty_treasure (void)
84{
85 treasure *t = new treasure;
86 102
87 t->chance = 100; 103 tl_map.insert (std::make_pair (tl->name, tl));
104 }
88 105
89 return t; 106 return tl;
90} 107}
108
109#ifdef TREASURE_DEBUG
110/* recursived checks the linked list. Treasurelist is passed only
111 * so that the treasure name can be printed out
112 */
113static void
114check_treasurelist (const treasure *t, const treasurelist * tl)
115{
116 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
117 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
118
119 if (t->next)
120 check_treasurelist (t->next, tl);
121
122 if (t->next_yes)
123 check_treasurelist (t->next_yes, tl);
124
125 if (t->next_no)
126 check_treasurelist (t->next_no, tl);
127}
128#endif
91 129
92/* 130/*
93 * Reads the lib/treasure file from disk, and parses the contents 131 * Reads the lib/treasure file from disk, and parses the contents
94 * into an internal treasure structure (very linked lists) 132 * into an internal treasure structure (very linked lists)
95 */ 133 */
96
97static treasure * 134static treasure *
98load_treasure (FILE * fp, int *line) 135read_treasure (object_thawer &f)
99{ 136{
100 char buf[MAX_BUF], *cp, variable[MAX_BUF];
101 treasure *t = get_empty_treasure (); 137 treasure *t = new treasure;
102 int value;
103 138
104 nroftreasures++; 139 f.next ();
105 while (fgets (buf, MAX_BUF, fp) != NULL)
106 {
107 (*line)++;
108 140
109 if (*buf == '#') 141 for (;;)
110 continue; 142 {
111 if ((cp = strchr (buf, '\n')) != NULL) 143 coroapi::cede_to_tick ();
112 *cp = '\0';
113 cp = buf;
114 while (isspace (*cp)) /* Skip blanks */
115 cp++;
116 144
117 if (sscanf (cp, "arch %s", variable)) 145 switch (f.kw)
118 {
119 if ((t->item = archetype::find (variable)) == NULL)
120 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121 } 146 {
122 else if (sscanf (cp, "list %s", variable)) 147 case KW_arch:
123 t->name = variable; 148 t->item = archetype::find (f.get_str ());
124 else if (sscanf (cp, "change_name %s", variable)) 149
125 t->change_arch.name = variable; 150 if (!t->item)
126 else if (sscanf (cp, "change_title %s", variable))
127 t->change_arch.title = variable;
128 else if (sscanf (cp, "change_slaying %s", variable))
129 t->change_arch.slaying = variable;
130 else if (sscanf (cp, "chance %d", &value))
131 t->chance = (uint8) value;
132 else if (sscanf (cp, "nrof %d", &value))
133 t->nrof = (uint16) value;
134 else if (sscanf (cp, "magic %d", &value))
135 t->magic = (uint8) value;
136 else if (!strcmp (cp, "yes"))
137 t->next_yes = load_treasure (fp, line);
138 else if (!strcmp (cp, "no"))
139 t->next_no = load_treasure (fp, line);
140 else if (!strcmp (cp, "end"))
141 return t;
142 else if (!strcmp (cp, "more"))
143 { 151 {
144 t->next = load_treasure (fp, line); 152 f.parse_warn ("treasure references unknown archetype");
153 t->item = archetype::empty;
154 }
155
156 break;
157
158 case KW_list: f.get (t->name); break;
159 case KW_change_name: f.get (t->change_arch.name); break;
160 case KW_change_title: f.get (t->change_arch.title); break;
161 case KW_change_slaying: f.get (t->change_arch.slaying); break;
162 case KW_chance: f.get (t->chance); break;
163 case KW_nrof: f.get (t->nrof); break;
164 case KW_magic: f.get (t->magic); break;
165
166 case KW_yes: t->next_yes = read_treasure (f); continue;
167 case KW_no: t->next_no = read_treasure (f); continue;
168
169 case KW_end:
170 f.next ();
145 return t; 171 return t;
172
173 case KW_more:
174 t->next = read_treasure (f);
175 return t;
176
177 default:
178 if (!f.parse_error ("treasurelist", t->name))
179 goto error;
180
181 return t;
146 } 182 }
147 else 183
148 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line); 184 f.next ();
149 } 185 }
150 LOG (llevError, "treasure lacks 'end'.\n"); 186
187 // not reached
188
189error:
190 delete t;
151 return t; 191 return 0;
152} 192}
153 193
154#ifdef TREASURE_DEBUG
155
156/* recursived checks the linked list. Treasurelist is passed only
157 * so that the treasure name can be printed out
158 */
159static void
160check_treasurelist (const treasure *t, const treasurelist * tl)
161{
162 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
163 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
164 /* find_treasurelist will print out its own error message */
165 if (t->name && *t->name)
166 find_treasurelist (t->name);
167 if (t->next)
168 check_treasurelist (t->next, tl);
169 if (t->next_yes)
170 check_treasurelist (t->next_yes, tl);
171 if (t->next_no)
172 check_treasurelist (t->next_no, tl);
173}
174#endif
175
176/* 194/*
177 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
178 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
179 */ 196 */
180 197treasurelist *
181void 198treasurelist::read (object_thawer &f)
182load_treasures (void)
183{ 199{
184 FILE *fp; 200 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
185 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186 treasurelist *previous = NULL;
187 treasure *t;
188 int comp, line = 0;
189 201
190 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 202 bool one = f.kw == KW_treasureone;
191 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 203 treasurelist *tl = treasurelist::get (f.get_str ());
192 { 204 clear (tl);
193 LOG (llevError, "Can't open treasure file.\n"); 205 tl->items = read_treasure (f);
206 if (!tl->items)
194 return; 207 return 0;
195 }
196 while (fgets (buf, MAX_BUF, fp) != NULL)
197 {
198 line++;
199 if (*buf == '#')
200 continue;
201 208
202 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
203 {
204 treasurelist *tl = get_empty_treasurelist ();
205
206 tl->name = name;
207 if (previous == NULL)
208 first_treasurelist = tl;
209 else
210 previous->next = tl;
211 previous = tl;
212 tl->items = load_treasure (fp, &line);
213
214 /* This is a one of the many items on the list should be generated. 209 /* This is a one of the many items on the list should be generated.
215 * Add up the chance total, and check to make sure the yes & no 210 * Add up the chance total, and check to make sure the yes & no
216 * fields of the treasures are not being used. 211 * fields of the treasures are not being used.
217 */ 212 */
218 if (!strncmp (buf, "treasureone", 11)) 213 if (one)
214 {
215 for (treasure *t = tl->items; t; t = t->next)
216 {
217 if (t->next_yes || t->next_no)
219 { 218 {
220 for (t = tl->items; t != NULL; t = t->next)
221 {
222#ifdef TREASURE_DEBUG
223 if (t->next_yes || t->next_no)
224 {
225 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 219 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
226 LOG (llevError, " the next_yes or next_no field is set\n"); 220 LOG (llevError, " the next_yes or next_no field is set\n");
227 }
228#endif
229 tl->total_chance += t->chance;
230 }
231 } 221 }
232 }
233 else
234 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
235 }
236 close_and_delete (fp, comp);
237 222
238#ifdef TREASURE_DEBUG 223 tl->total_chance += t->chance;
239 /* Perform some checks on how valid the treasure data actually is. 224 }
240 * verify that list transitions work (ie, the list that it is supposed 225 }
241 * to transition to exists). Also, verify that at least the name
242 * or archetype is set for each treasure element.
243 */
244 for (previous = first_treasurelist; previous != NULL; previous = previous->next)
245 check_treasurelist (previous->items, previous);
246#endif
247}
248 226
249/*
250 * Searches for the given treasurelist in the globally linked list
251 * of treasurelists which has been built by load_treasures().
252 */
253
254treasurelist *
255find_treasurelist (const char *name)
256{
257 shstr_cmp name_ (name);
258
259 if (!name_)
260 return 0;
261
262 for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
263 if (name_ == tl->name)
264 return tl;
265
266 if (first_treasurelist)
267 LOG (llevError, "Couldn't find treasurelist %s\n", name);
268
269 return 0; 227 return tl;
270} 228}
271
272 229
273/* 230/*
274 * Generates the objects specified by the given treasure. 231 * Generates the objects specified by the given treasure.
275 * It goes recursively through the rest of the linked list. 232 * It goes recursively through the rest of the linked list.
276 * If there is a certain percental chance for a treasure to be generated, 233 * If there is a certain percental chance for a treasure to be generated,
… …
282 * start with equipment, but only their abilities). 239 * start with equipment, but only their abilities).
283 */ 240 */
284static void 241static void
285put_treasure (object *op, object *creator, int flags) 242put_treasure (object *op, object *creator, int flags)
286{ 243{
287 object *tmp; 244 if (flags & GT_ENVIRONMENT)
288 245 {
289 /* Bit of a hack - spells should never be put onto the map. The entire 246 /* Bit of a hack - spells should never be put onto the map. The entire
290 * treasure stuff is a problem - there is no clear idea of knowing 247 * treasure stuff is a problem - there is no clear idea of knowing
291 * this is the original object, or if this is an object that should be created 248 * this is the original object, or if this is an object that should be created
292 * by another object. 249 * by another object.
293 */ 250 */
294 if (flags & GT_ENVIRONMENT && op->type != SPELL) 251 //TODO: flag such as objects... as such (no drop, anybody?)
295 { 252 if (op->type == SPELL)
296 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 253 {
254 op->destroy ();
255 return;
256 }
257
258 op->expand_tail ();
259
260 if (!creator->is_on_map ()
261 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
262 op->destroy ();
263 else
264 {
265 op->flag [FLAG_OBJ_ORIGINAL] = true;
297 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
267 }
298 } 268 }
299 else 269 else
300 { 270 {
301 op = creator->insert (op); 271 op = creator->insert (op);
302 272
303 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
304 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
305
306 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
307 esrv_send_item (tmp, op);
308 } 275 }
309} 276}
310 277
311/* if there are change_xxx commands in the treasure, we include the changes 278/* if there are change_xxx commands in the treasure, we include the changes
312 * in the generated object 279 * in the generated object
… …
326 293
327 if (t->change_arch.slaying) 294 if (t->change_arch.slaying)
328 op->slaying = t->change_arch.slaying; 295 op->slaying = t->change_arch.slaying;
329} 296}
330 297
331void 298static void
332create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 299create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
333{ 300{
334 object *tmp;
335
336 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 301 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
337 { 302 {
338 if (t->name) 303 if (t->name)
339 { 304 {
340 if (difficulty >= t->magic) 305 if (difficulty >= t->magic)
306 if (treasurelist *tl = treasurelist::find (t->name))
307 create_treasure (tl, op, flag, difficulty, tries);
308 else
309 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
310 }
311 else
312 {
313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
341 { 314 {
342 treasurelist *tl = find_treasurelist (t->name); 315 object *tmp = t->item->instance ();
343 if (tl) 316
344 create_treasure (tl, op, flag, difficulty, tries);
345 }
346 }
347 else
348 {
349 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350 {
351 tmp = arch_to_object (t->item);
352 if (t->nrof && tmp->nrof <= 1) 317 if (t->nrof && tmp->nrof <= 1)
353 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
319
354 fix_generated_item (tmp, op, difficulty, t->magic, flag); 320 fix_generated_item (tmp, op, difficulty, t->magic, flag);
355 change_treasure (t, tmp); 321 change_treasure (t, tmp);
356 put_treasure (tmp, op, flag); 322 put_treasure (tmp, op, flag);
357 } 323 }
358 } 324 }
359 325
360 if (t->next_yes != NULL) 326 if (t->next_yes)
361 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 327 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
362 } 328 }
363 else if (t->next_no != NULL) 329 else if (t->next_no)
364 create_all_treasures (t->next_no, op, flag, difficulty, tries); 330 create_all_treasures (t->next_no, op, flag, difficulty, tries);
365 331
366 if (t->next != NULL) 332 if (t->next)
367 create_all_treasures (t->next, op, flag, difficulty, tries); 333 create_all_treasures (t->next, op, flag, difficulty, tries);
368} 334}
369 335
370void 336static void
371create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 337create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
372{ 338{
373 int value = RANDOM () % tl->total_chance; 339 int value = rndm (tl->total_chance);
374 treasure *t; 340 treasure *t;
375 341
376 if (tries++ > 100) 342 if (tries++ > 100)
377 { 343 {
378 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 344 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
379 return; 345 return;
380 } 346 }
381 347
382 for (t = tl->items; t != NULL; t = t->next) 348 for (t = tl->items; t; t = t->next)
383 { 349 {
384 value -= t->chance; 350 value -= t->chance;
385 351
386 if (value < 0) 352 if (value < 0)
387 break; 353 break;
388 } 354 }
389 355
390 if (!t || value >= 0) 356 if (!t || value >= 0)
391 {
392 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 357 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
393 abort ();
394 return;
395 }
396 358
397 if (t->name) 359 if (t->name)
398 { 360 {
399 if (difficulty >= t->magic) 361 if (difficulty >= t->magic)
400 { 362 {
401 treasurelist *tl = find_treasurelist (t->name); 363 treasurelist *tl = treasurelist::find (t->name);
402 if (tl) 364 if (tl)
403 create_treasure (tl, op, flag, difficulty, tries); 365 create_treasure (tl, op, flag, difficulty, tries);
404 } 366 }
405 else if (t->nrof) 367 else if (t->nrof)
406 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
407
408 return;
409 } 369 }
410
411 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
412 { 371 {
413 object *tmp = arch_to_object (t->item); 372 if (object *tmp = t->item->instance ())
414 373 {
415 if (!tmp)
416 return;
417
418 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
419 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
420 376
421 fix_generated_item (tmp, op, difficulty, t->magic, flag); 377 fix_generated_item (tmp, op, difficulty, t->magic, flag);
422 change_treasure (t, tmp); 378 change_treasure (t, tmp);
423 put_treasure (tmp, op, flag); 379 put_treasure (tmp, op, flag);
380 }
424 } 381 }
382}
383
384void
385object::create_treasure (treasurelist *tl, int flags)
386{
387 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
425} 388}
426 389
427/* This calls the appropriate treasure creation function. tries is passed 390/* This calls the appropriate treasure creation function. tries is passed
428 * to determine how many list transitions or attempts to create treasure 391 * to determine how many list transitions or attempts to create treasure
429 * have been made. It is really in place to prevent infinite loops with 392 * have been made. It is really in place to prevent infinite loops with
… …
432 * to do that. 395 * to do that.
433 */ 396 */
434void 397void
435create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 398create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
436{ 399{
400 // empty treasurelists are legal
401 if (!tl->items)
402 return;
437 403
438 if (tries++ > 100) 404 if (tries++ > 100)
439 { 405 {
440 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 406 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441 return; 407 return;
442 } 408 }
409
410 if (op->flag [FLAG_TREASURE_ENV])
411 {
412 // do not generate items when there already is something above the object
413 if (op->flag [FLAG_IS_FLOOR] && op->above)
414 return;
415
416 flag |= GT_ENVIRONMENT;
417 }
418
443 if (tl->total_chance) 419 if (tl->total_chance)
444 create_one_treasure (tl, op, flag, difficulty, tries); 420 create_one_treasure (tl, op, flag, difficulty, tries);
445 else 421 else
446 create_all_treasures (tl->items, op, flag, difficulty, tries); 422 create_all_treasures (tl->items, op, flag, difficulty, tries);
447} 423}
… …
454object * 430object *
455generate_treasure (treasurelist *tl, int difficulty) 431generate_treasure (treasurelist *tl, int difficulty)
456{ 432{
457 difficulty = clamp (difficulty, 1, settings.max_level); 433 difficulty = clamp (difficulty, 1, settings.max_level);
458 434
459 object *ob = object::create (), *tmp; 435 object *ob = object::create ();
460 436
461 create_treasure (tl, ob, 0, difficulty, 0); 437 create_treasure (tl, ob, 0, difficulty, 0);
462 438
463 /* Don't want to free the object we are about to return */ 439 /* Don't want to free the object we are about to return */
464 tmp = ob->inv; 440 object *tmp = ob->inv;
465 if (tmp != NULL) 441 if (tmp)
466 tmp->remove (); 442 tmp->remove ();
467 443
468 if (ob->inv) 444 if (ob->inv)
469 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
470 446
471 ob->destroy (); 447 ob->destroy ();
448
472 return tmp; 449 return tmp;
473} 450}
474 451
475/* 452/*
476 * This is a new way of calculating the chance for an item to have 453 * This is a new way of calculating the chance for an item to have
… …
478 * The array has two arguments, the difficulty of the level, and the 455 * The array has two arguments, the difficulty of the level, and the
479 * magical bonus "wanted". 456 * magical bonus "wanted".
480 */ 457 */
481 458
482static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 459static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
483
484/*chance of magic difficulty*/ 460// chance of magic difficulty
485
486/* +0 +1 +2 +3 +4 */ 461// +0 +1 +2 +3 +4
487 {95, 2, 2, 1, 0}, /*1 */ 462 {95, 2, 2, 1, 0}, // 1
488 {92, 5, 2, 1, 0}, /*2 */ 463 {92, 5, 2, 1, 0}, // 2
489 {85, 10, 4, 1, 0}, /*3 */ 464 {85, 10, 4, 1, 0}, // 3
490 {80, 14, 4, 2, 0}, /*4 */ 465 {80, 14, 4, 2, 0}, // 4
491 {75, 17, 5, 2, 1}, /*5 */ 466 {75, 17, 5, 2, 1}, // 5
492 {70, 18, 8, 3, 1}, /*6 */ 467 {70, 18, 8, 3, 1}, // 6
493 {65, 21, 10, 3, 1}, /*7 */ 468 {65, 21, 10, 3, 1}, // 7
494 {60, 22, 12, 4, 2}, /*8 */ 469 {60, 22, 12, 4, 2}, // 8
495 {55, 25, 14, 4, 2}, /*9 */ 470 {55, 25, 14, 4, 2}, // 9
496 {50, 27, 16, 5, 2}, /*10 */ 471 {50, 27, 16, 5, 2}, // 10
497 {45, 28, 18, 6, 3}, /*11 */ 472 {45, 28, 18, 6, 3}, // 11
498 {42, 28, 20, 7, 3}, /*12 */ 473 {42, 28, 20, 7, 3}, // 12
499 {40, 27, 21, 8, 4}, /*13 */ 474 {40, 27, 21, 8, 4}, // 13
500 {38, 25, 22, 10, 5}, /*14 */ 475 {38, 25, 22, 10, 5}, // 14
501 {36, 23, 23, 12, 6}, /*15 */ 476 {36, 23, 23, 12, 6}, // 15
502 {33, 21, 24, 14, 8}, /*16 */ 477 {33, 21, 24, 14, 8}, // 16
503 {31, 19, 25, 16, 9}, /*17 */ 478 {31, 19, 25, 16, 9}, // 17
504 {27, 15, 30, 18, 10}, /*18 */ 479 {27, 15, 30, 18, 10}, // 18
505 {20, 12, 30, 25, 13}, /*19 */ 480 {20, 12, 30, 25, 13}, // 19
506 {15, 10, 28, 30, 17}, /*20 */ 481 {15, 10, 28, 30, 17}, // 20
507 {13, 9, 27, 28, 23}, /*21 */ 482 {13, 9, 27, 28, 23}, // 21
508 {10, 8, 25, 28, 29}, /*22 */ 483 {10, 8, 25, 28, 29}, // 22
509 {8, 7, 23, 26, 36}, /*23 */ 484 { 8, 7, 23, 26, 36}, // 23
510 {6, 6, 20, 22, 46}, /*24 */ 485 { 6, 6, 20, 22, 46}, // 24
511 {4, 5, 17, 18, 56}, /*25 */ 486 { 4, 5, 17, 18, 56}, // 25
512 {2, 4, 12, 14, 68}, /*26 */ 487 { 2, 4, 12, 14, 68}, // 26
513 {0, 3, 7, 10, 80}, /*27 */ 488 { 0, 3, 7, 10, 80}, // 27
514 {0, 0, 3, 7, 90}, /*28 */ 489 { 0, 0, 3, 7, 90}, // 28
515 {0, 0, 0, 3, 97}, /*29 */ 490 { 0, 0, 0, 3, 97}, // 29
516 {0, 0, 0, 0, 100}, /*30 */ 491 { 0, 0, 0, 0, 100}, // 30
517 {0, 0, 0, 0, 100}, /*31 */ 492 { 0, 0, 0, 0, 100}, // 31
518}; 493};
519
520 494
521/* calculate the appropriate level for wands staves and scrolls. 495/* calculate the appropriate level for wands staves and scrolls.
522 * This code presumes that op has had its spell object created (in op->inv) 496 * This code presumes that op has had its spell object created (in op->inv)
523 * 497 *
524 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
525 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
526 */ 500 */
527 501static int
528int
529level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
530{ 503{
531 int olevel = 0;
532
533 if (!op->inv) 504 if (!op->inv)
534 { 505 {
535 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 506 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
536 return 0; 507 return 0;
537 } 508 }
538 509
539 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
540 511
541 if (olevel <= 0) 512 if (olevel <= 0)
542 olevel = rndm (1, MIN (op->inv->level, 1)); 513 olevel = rndm (1, op->inv->level);
543 514
544 if (olevel > MAXLEVEL) 515 return min (olevel, MAXLEVEL_TREASURE);
545 olevel = MAXLEVEL;
546
547 return olevel;
548} 516}
549 517
550/* 518/*
551 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
552 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
555 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
556 * Scaling difficulty by max_level, as difficulty is a level and not some 524 * Scaling difficulty by max_level, as difficulty is a level and not some
557 * weird integer between 1-31. 525 * weird integer between 1-31.
558 * 526 *
559 */ 527 */
560 528static int
561int
562magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
563{ 530{
564 int percent = 0, magic = 0;
565 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 531 int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
532 scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
566 533
567 scaled_diff--; 534 int percent = rndm (100);
535 int magic;
568 536
569 if (scaled_diff < 0)
570 scaled_diff = 0;
571
572 if (scaled_diff >= DIFFLEVELS)
573 scaled_diff = DIFFLEVELS - 1;
574
575 percent = RANDOM () % 100;
576
577 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 537 for (magic = 0; magic <= MAXMAGIC; magic++)
578 { 538 {
579 percent -= difftomagic_list[scaled_diff][magic]; 539 percent -= difftomagic_list[scaled_diff][magic];
580 540
581 if (percent < 0) 541 if (percent < 0)
582 break; 542 break;
583 } 543 }
584 544
585 if (magic == (MAXMAGIC + 1)) 545 if (magic > MAXMAGIC)
586 { 546 {
587 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 547 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
588 magic = 0; 548 magic = 0;
589 } 549 }
590 550
591 magic = (RANDOM () % 3) ? magic : -magic; 551 magic = (rndm (3)) ? magic : -magic;
592 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ 552 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
593 553
594 return magic; 554 return magic;
595} 555}
596 556
… …
598 * Sets magical bonus in an object, and recalculates the effect on 558 * Sets magical bonus in an object, and recalculates the effect on
599 * the armour variable, and the effect on speed of armour. 559 * the armour variable, and the effect on speed of armour.
600 * This function doesn't work properly, should add use of archetypes 560 * This function doesn't work properly, should add use of archetypes
601 * to make it truly absolute. 561 * to make it truly absolute.
602 */ 562 */
603
604void 563void
605set_abs_magic (object *op, int magic) 564set_abs_magic (object *op, int magic)
606{ 565{
607 if (!magic) 566 if (!magic)
608 return; 567 return;
609 568
610 op->magic = magic; 569 op->magic = magic;
611 if (op->arch) 570 if (op->arch)
612 { 571 {
613 if (op->type == ARMOUR) 572 if (op->type == ARMOUR)
614 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 573 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
615 574
616 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 575 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
617 magic = (-magic); 576 magic = (-magic);
577
618 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 578 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
619 } 579 }
620 else 580 else
621 { 581 {
622 if (op->type == ARMOUR) 582 if (op->type == ARMOUR)
623 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 583 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
584
624 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 585 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
625 magic = (-magic); 586 magic = (-magic);
587
626 op->weight = (op->weight * (100 - magic * 10)) / 100; 588 op->weight = (op->weight * (100 - magic * 10)) / 100;
627 } 589 }
628} 590}
629 591
630/* 592/*
… …
633 */ 595 */
634 596
635static void 597static void
636set_magic (int difficulty, object *op, int max_magic, int flags) 598set_magic (int difficulty, object *op, int max_magic, int flags)
637{ 599{
638 int i;
639
640 i = magic_from_difficulty (difficulty); 600 int i = magic_from_difficulty (difficulty);
601
641 if ((flags & GT_ONLY_GOOD) && i < 0) 602 if ((flags & GT_ONLY_GOOD) && i < 0)
642 i = -i; 603 i = -i;
604
643 if (i > max_magic) 605 i = min (i, max_magic);
644 i = max_magic; 606
645 set_abs_magic (op, i); 607 set_abs_magic (op, i);
646 if (i < 0) 608 if (i < 0)
647 SET_FLAG (op, FLAG_CURSED); 609 op->set_flag (FLAG_CURSED);
648} 610}
649 611
650/* 612/*
651 * Randomly adds one magical ability to the given object. 613 * Randomly adds one magical ability to the given object.
652 * Modified for Partial Resistance in many ways: 614 * Modified for Partial Resistance in many ways:
653 * 1) Since rings can have multiple bonuses, if the same bonus 615 * 1) Since rings can have multiple bonuses, if the same bonus
654 * is rolled again, increase it - the bonuses now stack with 616 * is rolled again, increase it - the bonuses now stack with
655 * other bonuses previously rolled and ones the item might natively have. 617 * other bonuses previously rolled and ones the item might natively have.
656 * 2) Add code to deal with new PR method. 618 * 2) Add code to deal with new PR method.
657 */ 619 */
658 620static void
659void
660set_ring_bonus (object *op, int bonus) 621set_ring_bonus (object *op, int bonus)
661{ 622{
662
663 int r = RANDOM () % (bonus > 0 ? 25 : 11); 623 int r = rndm (bonus > 0 ? 25 : 11);
664 624
665 if (op->type == AMULET) 625 if (op->type == AMULET)
666 { 626 if (!rndm (21))
667 if (!(RANDOM () % 21)) 627 r = 20 + rndm (2);
668 r = 20 + RANDOM () % 2; 628 else if (rndm (2))
629 r = 10;
669 else 630 else
670 { 631 r = 11 + rndm (9);
671 if (RANDOM () & 2)
672 r = 10;
673 else
674 r = 11 + RANDOM () % 9;
675 }
676 }
677 632
678 switch (r) 633 switch (r)
679 { 634 {
680 /* Redone by MSW 2000-11-26 to have much less code. Also, 635 /* Redone by MSW 2000-11-26 to have much less code. Also,
681 * bonuses and penalties will stack and add to existing values. 636 * bonuses and penalties will stack and add to existing values.
682 * of the item. 637 * of the item.
683 */ 638 */
684 case 0: 639 case 0:
685 case 1: 640 case 1:
686 case 2: 641 case 2:
687 case 3: 642 case 3:
688 case 4: 643 case 4:
689 case 5: 644 case 5:
690 case 6: 645 case 6:
691 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 646 op->stats.stat (r) += bonus;
692 break; 647 break;
693 648
694 case 7: 649 case 7:
695 op->stats.dam += bonus; 650 op->stats.dam += bonus;
696 break; 651 break;
… …
716 case 16: 671 case 16:
717 case 17: 672 case 17:
718 case 18: 673 case 18:
719 case 19: 674 case 19:
720 { 675 {
721 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 676 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
722 677
723 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 678 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
724 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 679 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
725 680
726 /* Cursed items need to have higher negative values to equal out with 681 /* Cursed items need to have higher negative values to equal out with
727 * positive values for how protections work out. Put another 682 * positive values for how protections work out. Put another
728 * little random element in since that they don't always end up with 683 * little random element in since that they don't always end up with
729 * even values. 684 * even values.
730 */ 685 */
731 if (bonus < 0) 686 if (bonus < 0)
732 val = 2 * -val - RANDOM () % b; 687 val = 2 * -val - rndm (b);
733 if (val > 35) 688
734 val = 35; /* Upper limit */ 689 val = min (35, val); /* Upper limit */
690
735 b = 0; 691 b = 0;
692
736 while (op->resist[resist_table[resist]] != 0 && b < 4) 693 while (op->resist[resist_table[resist]] != 0 && b < 4)
737 {
738 resist = RANDOM () % num_resist_table; 694 resist = rndm (num_resist_table);
739 } 695
740 if (b == 4) 696 if (b == 4)
741 return; /* Not able to find a free resistance */ 697 return; /* Not able to find a free resistance */
698
742 op->resist[resist_table[resist]] = val; 699 op->resist[resist_table[resist]] = val;
743 /* We should probably do something more clever here to adjust value 700 /* We should probably do something more clever here to adjust value
744 * based on how good a resistance we gave. 701 * based on how good a resistance we gave.
745 */ 702 */
746 break; 703 break;
747 } 704 }
748 case 20: 705 case 20:
749 if (op->type == AMULET) 706 if (op->type == AMULET)
750 { 707 {
751 SET_FLAG (op, FLAG_REFL_SPELL); 708 op->set_flag (FLAG_REFL_SPELL);
752 op->value *= 11; 709 op->value *= 11;
753 } 710 }
754 else 711 else
755 { 712 {
756 op->stats.hp = 1; /* regenerate hit points */ 713 op->stats.hp = 1; /* regenerate hit points */
… …
759 break; 716 break;
760 717
761 case 21: 718 case 21:
762 if (op->type == AMULET) 719 if (op->type == AMULET)
763 { 720 {
764 SET_FLAG (op, FLAG_REFL_MISSILE); 721 op->set_flag (FLAG_REFL_MISSILE);
765 op->value *= 9; 722 op->value *= 9;
766 } 723 }
767 else 724 else
768 { 725 {
769 op->stats.sp = 1; /* regenerate spell points */ 726 op->stats.sp = 1; /* regenerate spell points */
… …
771 } 728 }
772 break; 729 break;
773 730
774 case 22: 731 case 22:
775 op->stats.exp += bonus; /* Speed! */ 732 op->stats.exp += bonus; /* Speed! */
776 op->value = (op->value * 2) / 3; 733 op->value = op->value * 2 / 3;
777 break; 734 break;
778 } 735 }
736
779 if (bonus > 0) 737 if (bonus > 0)
780 op->value *= 2 * bonus; 738 op->value = 2 * op->value * bonus;
781 else 739 else
782 op->value = -(op->value * 2 * bonus) / 3; 740 op->value = -2 * op->value * bonus / 3;
783} 741}
784 742
785/* 743/*
786 * get_magic(diff) will return a random number between 0 and 4. 744 * get_magic(diff) will return a random number between 0 and 4.
787 * diff can be any value above 2. The higher the diff-variable, the 745 * diff can be any value above 2. The higher the diff-variable, the
788 * higher is the chance of returning a low number. 746 * higher is the chance of returning a low number.
789 * It is only used in fix_generated_treasure() to set bonuses on 747 * It is only used in fix_generated_treasure() to set bonuses on
790 * rings and amulets. 748 * rings and amulets.
791 * Another scheme is used to calculate the magic of weapons and armours. 749 * Another scheme is used to calculate the magic of weapons and armours.
792 */ 750 */
793 751static int
794int
795get_magic (int diff) 752get_magic (int diff)
796{ 753{
797 int i; 754 diff = min (3, diff);
798 755
799 if (diff < 3)
800 diff = 3;
801 for (i = 0; i < 4; i++) 756 for (int i = 0; i < 4; i++)
802 if (RANDOM () % diff) 757 if (rndm (diff))
803 return i; 758 return i;
759
804 return 4; 760 return 4;
805} 761}
806 762
763/* special_potion() - so that old potion code is still done right. */
764static int
765special_potion (object *op)
766{
767 if (op->attacktype)
768 return 1;
769
770 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
771 return 1;
772
773 for (int i = 0; i < NROFATTACKS; i++)
774 if (op->resist[i])
775 return 1;
776
777 return 0;
778}
779
807#define DICE2 (get_magic(2)==2?2:1) 780#define DICE2 (get_magic(2) == 2 ? 2 : 1)
808#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 781#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
809 782
810/* 783/*
811 * fix_generated_item(): This is called after an item is generated, in 784 * fix_generated_item(): This is called after an item is generated, in
812 * order to set it up right. This produced magical bonuses, puts spells 785 * order to set it up right. This produced magical bonuses, puts spells
813 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 786 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
827 * value. 800 * value.
828 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 801 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
829 * a working object - don't change magic, value, etc, but set it material 802 * a working object - don't change magic, value, etc, but set it material
830 * type as appropriate, for objects that need spell objects, set those, etc 803 * type as appropriate, for objects that need spell objects, set those, etc
831 */ 804 */
832
833void 805void
834fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 806fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
835{ 807{
836 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 808 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
837 809
… …
842 save_item_power = op->item_power; 814 save_item_power = op->item_power;
843 op->item_power = 0; 815 op->item_power = 0;
844 816
845 if (op->randomitems && op->type != SPELL) 817 if (op->randomitems && op->type != SPELL)
846 { 818 {
847 create_treasure (op->randomitems, op, flags, difficulty, 0); 819 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
848 if (!op->inv)
849 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
850
851 /* So the treasure doesn't get created again */ 820 /* So the treasure doesn't get created again */
852 op->randomitems = NULL; 821 op->randomitems = 0;
853 } 822 }
854 823
855 if (difficulty < 1) 824 max_it (difficulty, 1);
856 difficulty = 1;
857 825
858 if (INVOKE_OBJECT (ADD_BONUS, op, 826 if (INVOKE_OBJECT (ADD_BONUS, op,
859 ARG_OBJECT (creator != op ? creator : 0), 827 ARG_OBJECT (creator != op ? creator : 0),
860 ARG_INT (difficulty), ARG_INT (max_magic), 828 ARG_INT (difficulty), ARG_INT (max_magic),
861 ARG_INT (flags))) 829 ARG_INT (flags)))
862 return; 830 return;
863 831
864 if (!(flags & GT_MINIMAL)) 832 if (!(flags & GT_MINIMAL))
865 { 833 {
866 if (op->arch == crown_arch) 834 if (IS_ARCH (op->arch, crown))
867 { 835 {
868 set_magic (difficulty, op, max_magic, flags); 836 set_magic (difficulty, op, max_magic, flags);
869 num_enchantments = calc_item_power (op, 1); 837 num_enchantments = calc_item_power (op, 1);
870 generate_artifact (op, difficulty); 838 generate_artifact (op, difficulty);
871 } 839 }
… …
874 if (!op->magic && max_magic) 842 if (!op->magic && max_magic)
875 set_magic (difficulty, op, max_magic, flags); 843 set_magic (difficulty, op, max_magic, flags);
876 844
877 num_enchantments = calc_item_power (op, 1); 845 num_enchantments = calc_item_power (op, 1);
878 846
879 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 847 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
880 * used for shop_floors or treasures */ 848 || op->type == HORN
849 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
881 generate_artifact (op, difficulty); 850 generate_artifact (op, difficulty);
882 } 851 }
883 852
884 /* Object was made an artifact. Calculate its item_power rating. 853 /* Object was made an artifact. Calculate its item_power rating.
885 * the item_power in the object is what the artfiact adds. 854 * the item_power in the object is what the artfiact adds.
… …
919 * again below */ 888 * again below */
920 } 889 }
921 } 890 }
922 891
923 /* materialtype modifications. Note we allow this on artifacts. */ 892 /* materialtype modifications. Note we allow this on artifacts. */
924 set_materialname (op, difficulty, NULL); 893 select_material (op, difficulty);
925 894
926 if (flags & GT_MINIMAL) 895 if (flags & GT_MINIMAL)
927 { 896 {
928 if (op->type == POTION) 897 if (op->type == POTION)
929 /* Handle healing and magic power potions */ 898 /* Handle healing and magic power potions */
930 if (op->stats.sp && !op->randomitems) 899 if (op->stats.sp && !op->randomitems)
931 { 900 {
932 object *tmp;
933
934 tmp = get_archetype (spell_mapping[op->stats.sp]); 901 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
935 insert_ob_in_ob (tmp, op); 902 insert_ob_in_ob (tmp, op);
936 op->stats.sp = 0; 903 op->stats.sp = 0;
937 } 904 }
938 } 905 }
939 else if (!op->title) /* Only modify object if not special */ 906 else if (!op->title) /* Only modify object if not special */
… …
942 case WEAPON: 909 case WEAPON:
943 case ARMOUR: 910 case ARMOUR:
944 case SHIELD: 911 case SHIELD:
945 case HELMET: 912 case HELMET:
946 case CLOAK: 913 case CLOAK:
947 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 914 if (op->flag [FLAG_CURSED] && !(rndm (4)))
948 set_ring_bonus (op, -DICE2); 915 set_ring_bonus (op, -DICE2);
949 break; 916 break;
950 917
951 case BRACERS: 918 case BRACERS:
952 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 919 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
953 { 920 {
954 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 921 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
955 if (!QUERY_FLAG (op, FLAG_CURSED)) 922 if (!op->flag [FLAG_CURSED])
956 op->value *= 3; 923 op->value *= 3;
957 } 924 }
958 break; 925 break;
959 926
960 case POTION: 927 case POTION:
… …
962 int too_many_tries = 0, is_special = 0; 929 int too_many_tries = 0, is_special = 0;
963 930
964 /* Handle healing and magic power potions */ 931 /* Handle healing and magic power potions */
965 if (op->stats.sp && !op->randomitems) 932 if (op->stats.sp && !op->randomitems)
966 { 933 {
967 object *tmp;
968
969 tmp = get_archetype (spell_mapping[op->stats.sp]); 934 object *tmp = get_archetype (spell_mapping[op->stats.sp]);
970 insert_ob_in_ob (tmp, op); 935 insert_ob_in_ob (tmp, op);
971 op->stats.sp = 0; 936 op->stats.sp = 0;
972 } 937 }
973 938
974 while (!(is_special = special_potion (op)) && !op->inv) 939 while (!(is_special = special_potion (op)) && !op->inv)
… …
982 * since the value set on those is already correct. 947 * since the value set on those is already correct.
983 */ 948 */
984 if (op->inv && op->randomitems) 949 if (op->inv && op->randomitems)
985 { 950 {
986 /* value multiplier is same as for scrolls */ 951 /* value multiplier is same as for scrolls */
987 op->value = (op->value * op->inv->value); 952 op->value *= op->inv->value;
988 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 953 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
989 } 954 }
990 else 955 else
991 { 956 {
992 op->name = "potion"; 957 op->name = shstr_potion;
993 op->name_pl = "potions"; 958 op->name_pl = shstr_potions;
994 } 959 }
995 960
996 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 961 if (!(flags & GT_ONLY_GOOD) && rndm (2))
997 SET_FLAG (op, FLAG_CURSED); 962 op->set_flag (FLAG_CURSED);
963
998 break; 964 break;
999 } 965 }
1000 966
1001 case AMULET: 967 case AMULET:
1002 if (op->arch == amulet_arch) 968 if (IS_ARCH (op->arch, amulet))
1003 op->value *= 5; /* Since it's not just decoration */ 969 op->value *= 5; /* Since it's not just decoration */
1004 970
1005 case RING: 971 case RING:
1006 if (op->arch == NULL)
1007 {
1008 op->destroy ();
1009 op = 0;
1010 break;
1011 }
1012
1013 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 972 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1014 break; 973 break;
1015 974
1016 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 975 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1017 SET_FLAG (op, FLAG_CURSED); 976 op->set_flag (FLAG_CURSED);
1018 977
1019 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 978 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1020 979
1021 if (op->type != RING) /* Amulets have only one ability */ 980 if (op->type != RING) /* Amulets have only one ability */
1022 break; 981 break;
1023 982
1024 if (!(RANDOM () % 4)) 983 if (!rndm (4))
1025 { 984 {
1026 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 985 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1027 986
1028 if (d > 0) 987 if (d > 0)
1029 op->value *= 3; 988 op->value *= 3;
1030 989
1031 set_ring_bonus (op, d); 990 set_ring_bonus (op, d);
1032 991
1033 if (!(RANDOM () % 4)) 992 if (!rndm (4))
1034 { 993 {
1035 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 994 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1036 995
1037 if (d > 0) 996 if (d > 0)
1038 op->value *= 5; 997 op->value *= 5;
998
1039 set_ring_bonus (op, d); 999 set_ring_bonus (op, d);
1040 } 1000 }
1041 } 1001 }
1042 1002
1043 if (GET_ANIM_ID (op)) 1003 if (op->animation_id)
1044 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1004 op->set_anim_frame (rndm (op->anim_frames ()));
1045 1005
1046 break; 1006 break;
1047 1007
1048 case BOOK: 1008 case BOOK:
1049 /* Is it an empty book?, if yes lets make a special· 1009 /* Is it an empty book?, if yes lets make a special·
1050 * msg for it, and tailor its properties based on the· 1010 * msg for it, and tailor its properties based on the·
1051 * creator and/or map level we found it on. 1011 * creator and/or map level we found it on.
1052 */ 1012 */
1053 if (!op->msg && RANDOM () % 10) 1013 if (!op->msg && rndm (10))
1054 { 1014 {
1055 /* set the book level properly */ 1015 /* set the book level properly */
1056 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1016 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1057 { 1017 {
1058 if (op->map && op->map->difficulty) 1018 if (op->map && op->map->difficulty)
1059 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1019 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1060 else 1020 else
1061 op->level = RANDOM () % 20 + 1; 1021 op->level = rndm (20) + 1;
1062 } 1022 }
1063 else 1023 else
1064 op->level = RANDOM () % creator->level; 1024 op->level = rndm (creator->level);
1065 1025
1066 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1026 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1067 /* books w/ info are worth more! */ 1027 /* books w/ info are worth more! */
1068 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1028 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1069 /* creator related stuff */
1070
1071 /* for library, chained books. Note that some monsters have no_pick
1072 * set - we don't want to set no pick in that case.
1073 */
1074 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1075 SET_FLAG (op, FLAG_NO_PICK);
1076 if (creator->slaying && !op->slaying) /* for check_inv floors */
1077 op->slaying = creator->slaying;
1078 1029
1079 /* add exp so reading it gives xp (once) */ 1030 /* add exp so reading it gives xp (once) */
1080 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1031 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1081 } 1032 }
1033
1034 /* creator related stuff */
1035
1036 /* for library, chained books. Note that some monsters have no_pick
1037 * set - we don't want to set no pick in that case.
1038 */
1039 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1040 op->set_flag (FLAG_NO_PICK);
1041 if (creator->slaying && !op->slaying) /* for check_inv floors */
1042 op->slaying = creator->slaying;
1082 break; 1043 break;
1083 1044
1084 case SPELLBOOK: 1045 case SPELLBOOK:
1085 op->value = op->value * op->inv->value; 1046 op->value *= pow ((op->inv->value > 0 ? op->inv->value : 1)
1047 * op->inv->level,
1048 1.5);
1049
1086 /* add exp so learning gives xp */ 1050 /* add exp so learning gives xp */
1087 op->level = op->inv->level; 1051 op->level = op->inv->level;
1088 op->stats.exp = op->value; 1052 op->stats.exp = op->value;
1089 break; 1053 break;
1090 1054
… …
1118 * reasonable. Otherwise, a high level version of a low level 1082 * reasonable. Otherwise, a high level version of a low level
1119 * spell can be worth tons a money (eg, level 20 rod, level 2 spell = 1083 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1120 * 10 time multiplier). This way, the value are a bit more reasonable. 1084 * 10 time multiplier). This way, the value are a bit more reasonable.
1121 */ 1085 */
1122 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1086 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1087
1123 /* maxhp is used to denote how many 'charges' the rod holds before */ 1088 /* maxhp is used to denote how many 'charges' the rod holds before */
1124 if (op->stats.maxhp) 1089 if (op->stats.maxhp)
1125 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1090 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1126 else 1091 else
1127 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1092 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1128 1093
1129 op->stats.hp = op->stats.maxhp; 1094 op->stats.hp = op->stats.maxhp;
1130 break; 1095 break;
1131 1096
1132 case SCROLL: 1097 case SCROLL:
… …
1147 break; 1112 break;
1148 } /* switch type */ 1113 } /* switch type */
1149 1114
1150 if (flags & GT_STARTEQUIP) 1115 if (flags & GT_STARTEQUIP)
1151 { 1116 {
1152 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1117 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1153 SET_FLAG (op, FLAG_STARTEQUIP); 1118 op->set_flag (FLAG_STARTEQUIP);
1154 else if (op->type != MONEY) 1119 else if (op->type != MONEY)
1155 op->value = 0; 1120 op->value = 0;
1156 } 1121 }
1157 1122
1158 if (!(flags & GT_ENVIRONMENT)) 1123 if (!(flags & GT_ENVIRONMENT))
… …
1168 */ 1133 */
1169 1134
1170/* 1135/*
1171 * Allocate and return the pointer to an empty artifactlist structure. 1136 * Allocate and return the pointer to an empty artifactlist structure.
1172 */ 1137 */
1173
1174static artifactlist * 1138static artifactlist *
1175get_empty_artifactlist (void) 1139get_empty_artifactlist ()
1176{ 1140{
1177 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1141 return salloc0<artifactlist> ();
1178
1179 if (al == NULL)
1180 fatal (OUT_OF_MEMORY);
1181 al->next = NULL;
1182 al->items = NULL;
1183 al->total_chance = 0;
1184 return al;
1185} 1142}
1186 1143
1187/* 1144/*
1188 * Allocate and return the pointer to an empty artifact structure. 1145 * Allocate and return the pointer to an empty artifact structure.
1189 */ 1146 */
1190
1191static artifact * 1147static artifact *
1192get_empty_artifact (void) 1148get_empty_artifact ()
1193{ 1149{
1194 artifact *a = (artifact *) malloc (sizeof (artifact)); 1150 return salloc0<artifact> ();
1195
1196 if (a == NULL)
1197 fatal (OUT_OF_MEMORY);
1198 a->item = NULL;
1199 a->next = NULL;
1200 a->chance = 0;
1201 a->difficulty = 0;
1202 a->allowed = NULL;
1203 return a;
1204} 1151}
1205 1152
1206/* 1153/*
1207 * Searches the artifact lists and returns one that has the same type 1154 * Searches the artifact lists and returns one that has the same type
1208 * of objects on it. 1155 * of objects on it.
1209 */ 1156 */
1210
1211artifactlist * 1157artifactlist *
1212find_artifactlist (int type) 1158find_artifactlist (int type)
1213{ 1159{
1214 artifactlist *al;
1215
1216 for (al = first_artifactlist; al != NULL; al = al->next) 1160 for (artifactlist *al = first_artifactlist; al; al = al->next)
1217 if (al->type == type) 1161 if (al->type == type)
1218 return al; 1162 return al;
1163
1219 return NULL; 1164 return 0;
1220} 1165}
1221 1166
1222/* 1167/*
1223 * For debugging purposes. Dumps all tables. 1168 * Builds up the lists of artifacts from the file in the libdir.
1224 */ 1169 */
1225
1226void 1170void
1227dump_artifacts (void)
1228{
1229 artifactlist *al;
1230 artifact *art;
1231 linked_char *next;
1232
1233 fprintf (logfile, "\n");
1234 for (al = first_artifactlist; al != NULL; al = al->next)
1235 {
1236 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1237 for (art = al->items; art != NULL; art = art->next)
1238 {
1239 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1240 if (art->allowed != NULL)
1241 {
1242 fprintf (logfile, "\tAllowed combinations:");
1243 for (next = art->allowed; next != NULL; next = next->next)
1244 fprintf (logfile, "%s,", &next->name);
1245 fprintf (logfile, "\n");
1246 }
1247 }
1248 }
1249 fprintf (logfile, "\n");
1250}
1251
1252/*
1253 * For debugging purposes. Dumps all treasures recursively (see below).
1254 */
1255void
1256dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1257{
1258 treasurelist *tl;
1259 int i;
1260
1261 if (depth > 100)
1262 return;
1263 while (t)
1264 {
1265 if (t->name)
1266 {
1267 for (i = 0; i < depth; i++)
1268 fprintf (logfile, " ");
1269 fprintf (logfile, "{ (list: %s)\n", &t->name);
1270 tl = find_treasurelist (t->name);
1271 if (tl)
1272 dump_monster_treasure_rec (name, tl->items, depth + 2);
1273 for (i = 0; i < depth; i++)
1274 fprintf (logfile, " ");
1275 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1276 }
1277 else
1278 {
1279 for (i = 0; i < depth; i++)
1280 fprintf (logfile, " ");
1281 if (t->item && t->item->clone.type == FLESH)
1282 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1283 else
1284 fprintf (logfile, "%s\n", &t->item->clone.name);
1285 }
1286
1287 if (t->next_yes)
1288 {
1289 for (i = 0; i < depth; i++)
1290 fprintf (logfile, " ");
1291 fprintf (logfile, " (if yes)\n");
1292 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1293 }
1294
1295 if (t->next_no)
1296 {
1297 for (i = 0; i < depth; i++)
1298 fprintf (logfile, " ");
1299 fprintf (logfile, " (if no)\n");
1300 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1301 }
1302
1303 t = t->next;
1304 }
1305}
1306
1307/*
1308 * For debugging purposes. Dumps all treasures for a given monster.
1309 * Created originally by Raphael Quinet for debugging the alchemy code.
1310 */
1311
1312void
1313dump_monster_treasure (const char *name)
1314{
1315 archetype *at;
1316 int found;
1317
1318 found = 0;
1319 fprintf (logfile, "\n");
1320 for (at = first_archetype; at != NULL; at = at->next)
1321 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1322 {
1323 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1324 if (at->clone.randomitems != NULL)
1325 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1326 else
1327 fprintf (logfile, "(nothing)\n");
1328 fprintf (logfile, "\n");
1329 found++;
1330 }
1331 if (found == 0)
1332 fprintf (logfile, "No objects have the name %s!\n\n", name);
1333}
1334
1335/*
1336 * Builds up the lists of artifacts from the file in the libdir.
1337 */
1338
1339void
1340init_artifacts (void) 1171init_artifacts ()
1341{ 1172{
1342 static int has_been_inited = 0; 1173 static int has_been_inited = 0;
1343 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;
1344 artifact *art = NULL; 1174 artifact *art = NULL;
1345 linked_char *tmp;
1346 int value;
1347 artifactlist *al; 1175 artifactlist *al;
1348 1176
1349 if (has_been_inited) 1177 if (has_been_inited)
1350 return; 1178 return;
1351 else 1179 else
1352 has_been_inited = 1; 1180 has_been_inited = 1;
1353 1181
1354 sprintf (filename, "%s/artifacts", settings.datadir); 1182 object_thawer f (settings.datadir, "artifacts");
1355 object_thawer thawer (filename);
1356 1183
1357 if (!thawer) 1184 if (!f)
1358 return; 1185 return;
1359 1186
1360 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1187 for (;;)
1361 { 1188 {
1362 if (*buf == '#') 1189 switch (f.kw)
1363 continue;
1364 if ((cp = strchr (buf, '\n')) != NULL)
1365 *cp = '\0';
1366 cp = buf;
1367 while (*cp == ' ') /* Skip blanks */
1368 cp++;
1369 if (*cp == '\0')
1370 continue;
1371
1372 if (!strncmp (cp, "Allowed", 7))
1373 { 1190 {
1191 case KW_allowed:
1374 if (art == NULL) 1192 if (!art)
1193 art = get_empty_artifact ();
1194
1375 { 1195 {
1376 art = get_empty_artifact (); 1196 if (!strcmp (f.get_str (), "all"))
1377 nrofartifacts++; 1197 break;
1198
1199 const char *cp = f.get_str ();
1200 char *next;
1201 do
1202 {
1203 if ((next = (char *)strchr (cp, ',')))
1204 *next++ = '\0';
1205
1206 linked_char *tmp = new linked_char;
1207
1208 tmp->name = cp;
1209 tmp->next = art->allowed;
1210 art->allowed = tmp;
1211 }
1212 while ((cp = next));
1378 } 1213 }
1379 cp = strchr (cp, ' ') + 1; 1214 break;
1380 if (!strcmp (cp, "all")) 1215
1216 case KW_chance:
1217 f.get (art->chance);
1218 break;
1219
1220 case KW_difficulty:
1221 f.get (art->difficulty);
1222 break;
1223
1224 case KW_object:
1225 {
1226 art->item = object::create ();
1227 f.get (art->item->name);
1228 f.next ();
1229
1230 if (!art->item->parse_kv (f))
1231 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1232
1233 al = find_artifactlist (art->item->type);
1234
1235 if (!al)
1236 {
1237 al = get_empty_artifactlist ();
1238 al->type = art->item->type;
1239 al->next = first_artifactlist;
1240 first_artifactlist = al;
1241 }
1242
1243 art->next = al->items;
1244 al->items = art;
1245 art = 0;
1246 }
1381 continue; 1247 continue;
1382 1248
1383 do 1249 case KW_EOF:
1250 goto done;
1251
1252 default:
1253 if (!f.parse_error ("artifacts file"))
1254 cleanup ("artifacts file required");
1384 { 1255 break;
1385 nrofallowedstr++;
1386 if ((next = strchr (cp, ',')) != NULL)
1387 *(next++) = '\0';
1388 tmp = new linked_char;
1389
1390 tmp->name = cp;
1391 tmp->next = art->allowed;
1392 art->allowed = tmp;
1393 }
1394 while ((cp = next) != NULL);
1395 }
1396 else if (sscanf (cp, "chance %d", &value))
1397 art->chance = (uint16) value;
1398 else if (sscanf (cp, "difficulty %d", &value))
1399 art->difficulty = (uint8) value;
1400 else if (!strncmp (cp, "Object", 6))
1401 { 1256 }
1402 art->item = object::create ();
1403 1257
1404 if (!load_object (thawer, art->item, 0)) 1258 f.next ();
1405 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1406
1407 art->item->name = strchr (cp, ' ') + 1;
1408 al = find_artifactlist (art->item->type);
1409 if (al == NULL)
1410 {
1411 al = get_empty_artifactlist ();
1412 al->type = art->item->type;
1413 al->next = first_artifactlist;
1414 first_artifactlist = al;
1415 }
1416 art->next = al->items;
1417 al->items = art;
1418 art = NULL;
1419 }
1420 else
1421 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1422 } 1259 }
1423 1260
1261done:
1424 for (al = first_artifactlist; al != NULL; al = al->next) 1262 for (al = first_artifactlist; al; al = al->next)
1425 { 1263 {
1264 al->total_chance = 0;
1265
1426 for (art = al->items; art != NULL; art = art->next) 1266 for (art = al->items; art; art = art->next)
1427 { 1267 {
1428 if (!art->chance) 1268 if (!art->chance)
1429 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1269 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1430 else 1270 else
1431 al->total_chance += art->chance; 1271 al->total_chance += art->chance;
1432 } 1272 }
1433#if 0 1273#if 0
1434 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance); 1274 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1435#endif 1275#endif
1436 } 1276 }
1437
1438 LOG (llevDebug, "done.\n");
1439} 1277}
1440
1441 1278
1442/* 1279/*
1443 * Used in artifact generation. The bonuses of the first object 1280 * Used in artifact generation. The bonuses of the first object
1444 * is modified by the bonuses of the second object. 1281 * is modified by the bonuses of the second object.
1445 */ 1282 */
1446
1447void 1283void
1448add_abilities (object *op, object *change) 1284add_abilities (object *op, object *change)
1449{ 1285{
1450 int i, tmp;
1451
1452 if (change->face != blank_face) 1286 if (change->face != blank_face)
1453 {
1454#ifdef TREASURE_VERBOSE
1455 LOG (llevDebug, "FACE: %d\n", change->face->number);
1456#endif
1457 op->face = change->face; 1287 op->face = change->face;
1458 }
1459 1288
1460 for (i = 0; i < NUM_STATS; i++) 1289 for (int i = 0; i < NUM_STATS; i++)
1461 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1290 change_attr_value (&(op->stats), i, change->stats.stat (i));
1462 1291
1463 op->attacktype |= change->attacktype; 1292 op->attacktype |= change->attacktype;
1464 op->path_attuned |= change->path_attuned; 1293 op->path_attuned |= change->path_attuned;
1465 op->path_repelled |= change->path_repelled; 1294 op->path_repelled |= change->path_repelled;
1466 op->path_denied |= change->path_denied; 1295 op->path_denied |= change->path_denied;
1467 op->move_type |= change->move_type; 1296 op->move_type |= change->move_type;
1468 op->stats.luck += change->stats.luck; 1297 op->stats.luck += change->stats.luck;
1469 1298
1470 if (QUERY_FLAG (change, FLAG_CURSED)) 1299 static const struct copyflags : object::flags_t
1471 SET_FLAG (op, FLAG_CURSED); 1300 {
1472 if (QUERY_FLAG (change, FLAG_DAMNED)) 1301 copyflags ()
1473 SET_FLAG (op, FLAG_DAMNED); 1302 {
1474 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1303 set (FLAG_CURSED);
1304 set (FLAG_DAMNED);
1305 set (FLAG_LIFESAVE);
1306 set (FLAG_REFL_SPELL);
1307 set (FLAG_STEALTH);
1308 set (FLAG_XRAYS);
1309 set (FLAG_BLIND);
1310 set (FLAG_SEE_IN_DARK);
1311 set (FLAG_REFL_MISSILE);
1312 set (FLAG_MAKE_INVIS);
1313 }
1314 } copyflags;
1315
1316 // we might want to just copy, but or'ing is what the original code did
1317 op->flag |= change->flag & copyflags;
1318
1319 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1475 set_abs_magic (op, -op->magic); 1320 set_abs_magic (op, -op->magic);
1476 1321
1477 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1322 if (change->flag [FLAG_STAND_STILL])
1478 SET_FLAG (op, FLAG_LIFESAVE);
1479 if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1480 SET_FLAG (op, FLAG_REFL_SPELL);
1481 if (QUERY_FLAG (change, FLAG_STEALTH))
1482 SET_FLAG (op, FLAG_STEALTH);
1483 if (QUERY_FLAG (change, FLAG_XRAYS))
1484 SET_FLAG (op, FLAG_XRAYS);
1485 if (QUERY_FLAG (change, FLAG_BLIND))
1486 SET_FLAG (op, FLAG_BLIND);
1487 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1488 SET_FLAG (op, FLAG_SEE_IN_DARK);
1489 if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1490 SET_FLAG (op, FLAG_REFL_MISSILE);
1491 if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1492 SET_FLAG (op, FLAG_MAKE_INVIS);
1493
1494 if (QUERY_FLAG (change, FLAG_STAND_STILL))
1495 { 1323 {
1496 CLEAR_FLAG (op, FLAG_ANIMATE); 1324 op->clr_flag (FLAG_ANIMATE);
1325
1497 /* so artifacts will join */ 1326 /* so artifacts will join */
1498 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1327 if (!op->flag [FLAG_ALIVE])
1499 op->speed = 0.0; 1328 op->speed = 0.;
1500 1329
1501 op->set_speed (op->speed); 1330 op->set_speed (op->speed);
1502 } 1331 }
1503 1332
1504 if (change->nrof) 1333 if (change->nrof)
1505 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1334 op->nrof = rndm (change->nrof) + 1;
1506 1335
1507 op->stats.exp += change->stats.exp; /* Speed modifier */ 1336 op->stats.exp += change->stats.exp; /* Speed modifier */
1508 op->stats.wc += change->stats.wc; 1337 op->stats.wc += change->stats.wc;
1509 op->stats.ac += change->stats.ac; 1338 op->stats.ac += change->stats.ac;
1510 1339
1511 if (change->other_arch) 1340 if (change->other_arch)
1512 { 1341 {
1513 /* Basically, for horns & potions, the other_arch field is the spell 1342 /* Basically, for horns & potions, the other_arch field is the spell
1514 * to cast. So convert that to into a spell and put it into 1343 * to cast. So convert that to into a spell and put it into
1515 * this object. 1344 * this object.
1516 */ 1345 */
1517 if (op->type == HORN || op->type == POTION) 1346 if (op->type == HORN || op->type == POTION)
1518 { 1347 {
1519 object *tmp_obj;
1520
1521 /* Remove any spells this object currently has in it */ 1348 /* Remove any spells this object currently has in it */
1522 while (op->inv)
1523 op->inv->destroy (); 1349 op->destroy_inv (false);
1524 1350
1525 tmp_obj = arch_to_object (change->other_arch); 1351 object *tmp = change->other_arch->instance ();
1526 insert_ob_in_ob (tmp_obj, op); 1352 insert_ob_in_ob (tmp, op);
1527 } 1353 }
1354
1528 /* No harm setting this for potions/horns */ 1355 /* No harm setting this for potions/horns */
1529 op->other_arch = change->other_arch; 1356 op->other_arch = change->other_arch;
1530 } 1357 }
1531 1358
1532 if (change->stats.hp < 0) 1359 if (change->stats.hp < 0)
… …
1548 op->stats.maxsp = -change->stats.maxsp; 1375 op->stats.maxsp = -change->stats.maxsp;
1549 else 1376 else
1550 op->stats.maxsp += change->stats.maxsp; 1377 op->stats.maxsp += change->stats.maxsp;
1551 1378
1552 if (change->stats.food < 0) 1379 if (change->stats.food < 0)
1553 op->stats.food = -(change->stats.food); 1380 op->stats.food = -change->stats.food;
1554 else 1381 else
1555 op->stats.food += change->stats.food; 1382 op->stats.food += change->stats.food;
1556 1383
1557 if (change->level < 0) 1384 if (change->level < 0)
1558 op->level = -(change->level); 1385 op->level = -change->level;
1559 else 1386 else
1560 op->level += change->level; 1387 op->level += change->level;
1561 1388
1562 if (change->gen_sp_armour < 0) 1389 if (change->gen_sp_armour < 0)
1563 op->gen_sp_armour = -(change->gen_sp_armour); 1390 op->gen_sp_armour = -change->gen_sp_armour;
1564 else 1391 else
1565 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1392 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1566 1393
1567 op->item_power = change->item_power; 1394 op->item_power = change->item_power;
1568 1395
1569 for (i = 0; i < NROFATTACKS; i++) 1396 for (int i = 0; i < NROFATTACKS; i++)
1570 if (change->resist[i])
1571 op->resist[i] += change->resist[i]; 1397 op->resist[i] += change->resist[i];
1572 1398
1573 if (change->stats.dam) 1399 if (change->stats.dam)
1574 { 1400 {
1575 if (change->stats.dam < 0) 1401 if (change->stats.dam < 0)
1576 op->stats.dam = (-change->stats.dam); 1402 op->stats.dam = -change->stats.dam;
1577 else if (op->stats.dam) 1403 else if (op->stats.dam)
1578 { 1404 {
1579 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1405 int tmp = op->stats.dam * change->stats.dam / 10;
1406
1580 if (tmp == op->stats.dam) 1407 if (tmp == op->stats.dam)
1581 { 1408 {
1582 if (change->stats.dam < 10) 1409 if (change->stats.dam < 10)
1583 op->stats.dam--; 1410 op->stats.dam--;
1584 else 1411 else
… …
1590 } 1417 }
1591 1418
1592 if (change->weight) 1419 if (change->weight)
1593 { 1420 {
1594 if (change->weight < 0) 1421 if (change->weight < 0)
1595 op->weight = (-change->weight); 1422 op->weight = -change->weight;
1596 else 1423 else
1597 op->weight = (op->weight * (change->weight)) / 100; 1424 op->weight = op->weight * change->weight / 100;
1598 } 1425 }
1599 1426
1600 if (change->last_sp) 1427 if (change->last_sp)
1601 { 1428 {
1602 if (change->last_sp < 0) 1429 if (change->last_sp < 0)
1603 op->last_sp = (-change->last_sp); 1430 op->last_sp = -change->last_sp;
1604 else 1431 else
1605 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1432 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1606 } 1433 }
1607 1434
1608 if (change->gen_sp_armour) 1435 if (change->gen_sp_armour)
1609 { 1436 {
1610 if (change->gen_sp_armour < 0) 1437 if (change->gen_sp_armour < 0)
1611 op->gen_sp_armour = (-change->gen_sp_armour); 1438 op->gen_sp_armour = -change->gen_sp_armour;
1612 else 1439 else
1613 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1440 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1614 } 1441 }
1615 1442
1616 op->value *= change->value; 1443 op->value *= change->value;
1617 1444
1618 if (change->material) 1445 if (change->materials)
1446 op->materials = change->materials;
1447
1448 if (change->material != MATERIAL_NULL)
1619 op->material = change->material; 1449 op->material = change->material;
1620
1621 if (change->materialname)
1622 op->materialname = change->materialname;
1623 1450
1624 if (change->slaying) 1451 if (change->slaying)
1625 op->slaying = change->slaying; 1452 op->slaying = change->slaying;
1626 1453
1627 if (change->race) 1454 if (change->race)
… …
1630 if (change->msg) 1457 if (change->msg)
1631 op->msg = change->msg; 1458 op->msg = change->msg;
1632} 1459}
1633 1460
1634static int 1461static int
1635legal_artifact_combination (object *op, artifact * art) 1462legal_artifact_combination (object *op, artifact *art)
1636{ 1463{
1637 int neg, success = 0; 1464 int neg, success = 0;
1638 linked_char *tmp; 1465 linked_char *tmp;
1639 const char *name; 1466 const char *name;
1640 1467
1641 if (art->allowed == (linked_char *) NULL) 1468 if (!art->allowed)
1642 return 1; /* Ie, "all" */ 1469 return 1; /* Ie, "all" */
1470
1643 for (tmp = art->allowed; tmp; tmp = tmp->next) 1471 for (tmp = art->allowed; tmp; tmp = tmp->next)
1644 { 1472 {
1645#ifdef TREASURE_VERBOSE 1473#ifdef TREASURE_VERBOSE
1646 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1474 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1647#endif 1475#endif
1648 if (*tmp->name == '!') 1476 if (*tmp->name == '!')
1649 name = tmp->name + 1, neg = 1; 1477 name = tmp->name + 1, neg = 1;
1650 else 1478 else
1651 name = tmp->name, neg = 0; 1479 name = tmp->name, neg = 0;
1652 1480
1653 /* If we match name, then return the opposite of 'neg' */ 1481 /* If we match name, then return the opposite of 'neg' */
1654 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1482 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1655 return !neg; 1483 return !neg;
1656 1484
1657 /* Set success as true, since if the match was an inverse, it means 1485 /* Set success as true, since if the match was an inverse, it means
1658 * everything is allowed except what we match 1486 * everything is allowed except what we match
1659 */ 1487 */
1660 else if (neg) 1488 else if (neg)
1661 success = 1; 1489 success = 1;
1662 } 1490 }
1491
1663 return success; 1492 return success;
1664} 1493}
1665 1494
1666/* 1495/*
1667 * Fixes the given object, giving it the abilities and titles 1496 * Fixes the given object, giving it the abilities and titles
… …
1669 */ 1498 */
1670 1499
1671void 1500void
1672give_artifact_abilities (object *op, object *artifct) 1501give_artifact_abilities (object *op, object *artifct)
1673{ 1502{
1674 char new_name[MAX_BUF]; 1503 op->title = format ("of %s", &artifct->name);
1675 1504
1676 sprintf (new_name, "of %s", &artifct->name);
1677 op->title = new_name;
1678 add_abilities (op, artifct); /* Give out the bonuses */ 1505 add_abilities (op, artifct); /* Give out the bonuses */
1679 1506
1680#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1507#if 0 /* Bit verbose, but keep it here until next time I need it... */
1681 { 1508 {
1682 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1509 char identified = op->flag [FLAG_IDENTIFIED];
1683 1510
1684 SET_FLAG (op, FLAG_IDENTIFIED); 1511 op->set_flag (FLAG_IDENTIFIED);
1685 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1512 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1686 if (!identified) 1513 if (!identified)
1687 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1514 op->clr_flag (FLAG_IDENTIFIED);
1688 } 1515 }
1689#endif 1516#endif
1690 return; 1517 return;
1691} 1518}
1692 1519
… …
1702#define ARTIFACT_TRIES 2 1529#define ARTIFACT_TRIES 2
1703 1530
1704void 1531void
1705generate_artifact (object *op, int difficulty) 1532generate_artifact (object *op, int difficulty)
1706{ 1533{
1707 artifactlist *al;
1708 artifact *art; 1534 artifact *art;
1709 int i;
1710 1535
1711 al = find_artifactlist (op->type); 1536 artifactlist *al = find_artifactlist (op->type);
1712 1537
1713 if (al == NULL) 1538 if (al == NULL)
1714 { 1539 {
1715#if 0 /* This is too verbose, usually */ 1540#if 0 /* This is too verbose, usually */
1716 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1541 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1717#endif 1542#endif
1718 return; 1543 return;
1719 } 1544 }
1720 1545
1721 for (i = 0; i < ARTIFACT_TRIES; i++) 1546 for (int i = 0; i < ARTIFACT_TRIES; i++)
1722 { 1547 {
1723 int roll = RANDOM () % al->total_chance; 1548 int roll = rndm (al->total_chance);
1724 1549
1725 for (art = al->items; art != NULL; art = art->next) 1550 for (art = al->items; art; art = art->next)
1726 { 1551 {
1727 roll -= art->chance; 1552 roll -= art->chance;
1728 if (roll < 0) 1553 if (roll < 0)
1729 break; 1554 break;
1730 } 1555 }
… …
1734#if 1 1559#if 1
1735 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1560 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1736#endif 1561#endif
1737 return; 1562 return;
1738 } 1563 }
1739 if (!strcmp (art->item->name, "NONE")) 1564
1565 if (art->item->name == shstr_NONE)
1740 return; 1566 return;
1567
1741 if (FABS (op->magic) < art->item->magic) 1568 if (fabs (op->magic) < art->item->magic)
1742 continue; /* Not magic enough to be this item */ 1569 continue; /* Not magic enough to be this item */
1743 1570
1744 /* Map difficulty not high enough */ 1571 /* Map difficulty not high enough */
1745 if (difficulty < art->difficulty) 1572 if (difficulty < art->difficulty)
1746 continue; 1573 continue;
1747 1574
1748 if (!legal_artifact_combination (op, art)) 1575 if (!legal_artifact_combination (op, art))
1749 { 1576 {
1750#ifdef TREASURE_VERBOSE 1577#ifdef TREASURE_VERBOSE
1751 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1578 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1752#endif 1579#endif
1753 continue; 1580 continue;
1754 } 1581 }
1582
1755 give_artifact_abilities (op, art->item); 1583 give_artifact_abilities (op, art->item);
1756 return; 1584 return;
1757 } 1585 }
1758} 1586}
1759 1587
… …
1763 */ 1591 */
1764 1592
1765void 1593void
1766fix_flesh_item (object *item, object *donor) 1594fix_flesh_item (object *item, object *donor)
1767{ 1595{
1768 char tmpbuf[MAX_BUF];
1769 int i;
1770
1771 if (item->type == FLESH && donor) 1596 if (item->type == FLESH && donor)
1772 { 1597 {
1773 /* change the name */ 1598 /* change the name */
1774 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1599 item->name = format ("%s's %s", &donor->name, &item->name);
1775 item->name = tmpbuf;
1776 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1600 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1777 item->name_pl = tmpbuf;
1778 1601
1779 /* weight is FLESH weight/100 * donor */ 1602 /* weight is FLESH weight/100 * donor */
1780 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1603 item->weight = max (1, item->weight * donor->weight / 100);
1781 item->weight = 1;
1782 1604
1783 /* value is multiplied by level of donor */ 1605 /* value is multiplied by level of donor */
1784 item->value *= isqrt (donor->level * 2); 1606 item->value *= isqrt (donor->level * 2);
1785 1607
1786 /* food value */ 1608 /* food value */
1787 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1609 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1788 1610
1789 /* flesh items inherit some abilities of donor, but not 1611 /* flesh items inherit some abilities of donor, but not
1790 * full effect. 1612 * full effect.
1791 */ 1613 */
1792 for (i = 0; i < NROFATTACKS; i++) 1614 for (int i = 0; i < NROFATTACKS; i++)
1793 item->resist[i] = donor->resist[i] / 2; 1615 item->resist[i] = donor->resist[i] / 2;
1794 1616
1795 /* item inherits donor's level (important for quezals) */ 1617 /* item inherits donor's level (important for quezals) */
1796 item->level = donor->level; 1618 item->level = donor->level;
1797 1619
1798 /* if donor has some attacktypes, the flesh is poisonous */ 1620 /* if donor has some attacktypes, the flesh is poisonous */
1799 if (donor->attacktype & AT_POISON) 1621 if (donor->attacktype & AT_POISON)
1800 item->type = POISON; 1622 item->type = POISON;
1623
1801 if (donor->attacktype & AT_ACID) 1624 if (donor->attacktype & AT_ACID)
1802 item->stats.hp = -1 * item->stats.food; 1625 item->stats.hp = -item->stats.food;
1803 SET_FLAG (item, FLAG_NO_STEAL);
1804 }
1805}
1806 1626
1807/* special_potion() - so that old potion code is still done right. */ 1627 item->set_flag (FLAG_NO_STEAL);
1808 1628 }
1809int
1810special_potion (object *op)
1811{
1812 if (op->attacktype)
1813 return 1;
1814
1815 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1816 return 1;
1817
1818 for (int i = 0; i < NROFATTACKS; i++)
1819 if (op->resist[i])
1820 return 1;
1821
1822 return 0;
1823} 1629}
1824 1630
1825void 1631static void
1826free_treasurestruct (treasure *t) 1632free_treasurestruct (treasure *t)
1827{ 1633{
1828 if (t->next)
1829 free_treasurestruct (t->next); 1634 if (t->next) free_treasurestruct (t->next);
1830 if (t->next_yes)
1831 free_treasurestruct (t->next_yes); 1635 if (t->next_yes) free_treasurestruct (t->next_yes);
1832 if (t->next_no)
1833 free_treasurestruct (t->next_no); 1636 if (t->next_no) free_treasurestruct (t->next_no);
1834 1637
1835 delete t; 1638 delete t;
1836} 1639}
1837 1640
1838void 1641static void
1839free_charlinks (linked_char *lc) 1642free_charlinks (linked_char *lc)
1840{ 1643{
1841 if (lc->next) 1644 if (lc->next)
1842 free_charlinks (lc->next); 1645 free_charlinks (lc->next);
1843 1646
1844 delete lc; 1647 delete lc;
1845} 1648}
1846 1649
1847void 1650static void
1848free_artifact (artifact * at) 1651free_artifact (artifact *at)
1849{ 1652{
1850 if (at->next)
1851 free_artifact (at->next); 1653 if (at->next) free_artifact (at->next);
1852
1853 if (at->allowed)
1854 free_charlinks (at->allowed); 1654 if (at->allowed) free_charlinks (at->allowed);
1855 1655
1856 at->item->destroy (1); 1656 at->item->destroy ();
1857 1657
1858 delete at;
1859}
1860
1861void
1862free_artifactlist (artifactlist * al)
1863{
1864 artifactlist *nextal;
1865
1866 for (al = first_artifactlist; al; al = nextal)
1867 {
1868 nextal = al->next;
1869
1870 if (al->items)
1871 free_artifact (al->items);
1872
1873 free (al); 1658 sfree (at);
1874 }
1875} 1659}
1876 1660
1877void
1878free_all_treasures (void)
1879{
1880 treasurelist *tl, *next;
1881
1882
1883 for (tl = first_treasurelist; tl != NULL; tl = next)
1884 {
1885 next = tl->next;
1886 if (tl->items)
1887 free_treasurestruct (tl->items);
1888 delete tl;
1889 }
1890 free_artifactlist (first_artifactlist);
1891}

Diff Legend

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