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.35 by root, Sat Jan 27 02:19:36 2007 UTC vs.
Revision 1.117 by root, Wed Nov 16 23:41:59 2016 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,2011,2012,2013,2014,2015,2016 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 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 17 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 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
20 * <http://www.gnu.org/licenses/>.
23 */ 21 *
24 22 * The authors can be reached via e-mail to <support@deliantra.net>
25#define ALLOWED_COMBINATION 23 */
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 || (rndm (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 = rndm (t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
354 319
355 fix_generated_item (tmp, op, difficulty, t->magic, flag); 320 fix_generated_item (tmp, op, difficulty, t->magic, flag);
356 change_treasure (t, tmp); 321 change_treasure (t, tmp);
357 put_treasure (tmp, op, flag); 322 put_treasure (tmp, op, flag);
358 } 323 }
359 } 324 }
360 325
361 if (t->next_yes != NULL) 326 if (t->next_yes)
362 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 327 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363 } 328 }
364 else if (t->next_no != NULL) 329 else if (t->next_no)
365 create_all_treasures (t->next_no, op, flag, difficulty, tries); 330 create_all_treasures (t->next_no, op, flag, difficulty, tries);
366 331
367 if (t->next != NULL) 332 if (t->next)
368 create_all_treasures (t->next, op, flag, difficulty, tries); 333 create_all_treasures (t->next, op, flag, difficulty, tries);
369} 334}
370 335
371void 336static void
372create_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)
373{ 338{
374 int value = rndm (tl->total_chance); 339 int value = rndm (tl->total_chance);
375 treasure *t; 340 treasure *t;
376 341
… …
378 { 343 {
379 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");
380 return; 345 return;
381 } 346 }
382 347
383 for (t = tl->items; t != NULL; t = t->next) 348 for (t = tl->items; t; t = t->next)
384 { 349 {
385 value -= t->chance; 350 value -= t->chance;
386 351
387 if (value < 0) 352 if (value < 0)
388 break; 353 break;
389 } 354 }
390 355
391 if (!t || value >= 0) 356 if (!t || value >= 0)
392 {
393 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);
394 abort ();
395 return;
396 }
397 358
398 if (t->name) 359 if (t->name)
399 { 360 {
400 if (difficulty >= t->magic) 361 if (difficulty >= t->magic)
401 { 362 {
402 treasurelist *tl = find_treasurelist (t->name); 363 treasurelist *tl = treasurelist::find (t->name);
403 if (tl) 364 if (tl)
404 create_treasure (tl, op, flag, difficulty, tries); 365 create_treasure (tl, op, flag, difficulty, tries);
405 } 366 }
406 else if (t->nrof) 367 else if (t->nrof)
407 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
408
409 return;
410 } 369 }
411
412 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
413 { 371 {
414 object *tmp = arch_to_object (t->item); 372 if (object *tmp = t->item->instance ())
415 373 {
416 if (!tmp)
417 return;
418
419 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
420 tmp->nrof = rndm (t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
421 376
422 fix_generated_item (tmp, op, difficulty, t->magic, flag); 377 fix_generated_item (tmp, op, difficulty, t->magic, flag);
423 change_treasure (t, tmp); 378 change_treasure (t, tmp);
424 put_treasure (tmp, op, flag); 379 put_treasure (tmp, op, flag);
380 }
425 } 381 }
382}
383
384void
385object::create_treasure (treasurelist *tl, int flags)
386{
387 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
426} 388}
427 389
428/* This calls the appropriate treasure creation function. tries is passed 390/* This calls the appropriate treasure creation function. tries is passed
429 * to determine how many list transitions or attempts to create treasure 391 * to determine how many list transitions or attempts to create treasure
430 * 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
… …
433 * to do that. 395 * to do that.
434 */ 396 */
435void 397void
436create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 398create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
437{ 399{
400 // empty treasurelists are legal
401 if (!tl->items)
402 return;
438 403
439 if (tries++ > 100) 404 if (tries++ > 100)
440 { 405 {
441 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 406 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
442 return; 407 return;
443 } 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
444 if (tl->total_chance) 419 if (tl->total_chance)
445 create_one_treasure (tl, op, flag, difficulty, tries); 420 create_one_treasure (tl, op, flag, difficulty, tries);
446 else 421 else
447 create_all_treasures (tl->items, op, flag, difficulty, tries); 422 create_all_treasures (tl->items, op, flag, difficulty, tries);
448} 423}
… …
455object * 430object *
456generate_treasure (treasurelist *tl, int difficulty) 431generate_treasure (treasurelist *tl, int difficulty)
457{ 432{
458 difficulty = clamp (difficulty, 1, settings.max_level); 433 difficulty = clamp (difficulty, 1, settings.max_level);
459 434
460 object *ob = object::create (), *tmp; 435 object *ob = object::create ();
461 436
462 create_treasure (tl, ob, 0, difficulty, 0); 437 create_treasure (tl, ob, 0, difficulty, 0);
463 438
464 /* 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 */
465 tmp = ob->inv; 440 object *tmp = ob->inv;
466 if (tmp != NULL) 441 if (tmp)
467 tmp->remove (); 442 tmp->remove ();
468 443
469 if (ob->inv) 444 if (ob->inv)
470 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
471 446
472 ob->destroy (); 447 ob->destroy ();
448
473 return tmp; 449 return tmp;
474} 450}
475 451
476/* 452/*
477 * 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
… …
479 * 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
480 * magical bonus "wanted". 456 * magical bonus "wanted".
481 */ 457 */
482 458
483static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 459static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484
485/*chance of magic difficulty*/ 460// chance of magic difficulty
486
487/* +0 +1 +2 +3 +4 */ 461// +0 +1 +2 +3 +4
488 {95, 2, 2, 1, 0}, /*1 */ 462 {95, 2, 2, 1, 0}, // 1
489 {92, 5, 2, 1, 0}, /*2 */ 463 {92, 5, 2, 1, 0}, // 2
490 {85, 10, 4, 1, 0}, /*3 */ 464 {85, 10, 4, 1, 0}, // 3
491 {80, 14, 4, 2, 0}, /*4 */ 465 {80, 14, 4, 2, 0}, // 4
492 {75, 17, 5, 2, 1}, /*5 */ 466 {75, 17, 5, 2, 1}, // 5
493 {70, 18, 8, 3, 1}, /*6 */ 467 {70, 18, 8, 3, 1}, // 6
494 {65, 21, 10, 3, 1}, /*7 */ 468 {65, 21, 10, 3, 1}, // 7
495 {60, 22, 12, 4, 2}, /*8 */ 469 {60, 22, 12, 4, 2}, // 8
496 {55, 25, 14, 4, 2}, /*9 */ 470 {55, 25, 14, 4, 2}, // 9
497 {50, 27, 16, 5, 2}, /*10 */ 471 {50, 27, 16, 5, 2}, // 10
498 {45, 28, 18, 6, 3}, /*11 */ 472 {45, 28, 18, 6, 3}, // 11
499 {42, 28, 20, 7, 3}, /*12 */ 473 {42, 28, 20, 7, 3}, // 12
500 {40, 27, 21, 8, 4}, /*13 */ 474 {40, 27, 21, 8, 4}, // 13
501 {38, 25, 22, 10, 5}, /*14 */ 475 {38, 25, 22, 10, 5}, // 14
502 {36, 23, 23, 12, 6}, /*15 */ 476 {36, 23, 23, 12, 6}, // 15
503 {33, 21, 24, 14, 8}, /*16 */ 477 {33, 21, 24, 14, 8}, // 16
504 {31, 19, 25, 16, 9}, /*17 */ 478 {31, 19, 25, 16, 9}, // 17
505 {27, 15, 30, 18, 10}, /*18 */ 479 {27, 15, 30, 18, 10}, // 18
506 {20, 12, 30, 25, 13}, /*19 */ 480 {20, 12, 30, 25, 13}, // 19
507 {15, 10, 28, 30, 17}, /*20 */ 481 {15, 10, 28, 30, 17}, // 20
508 {13, 9, 27, 28, 23}, /*21 */ 482 {13, 9, 27, 28, 23}, // 21
509 {10, 8, 25, 28, 29}, /*22 */ 483 {10, 8, 25, 28, 29}, // 22
510 {8, 7, 23, 26, 36}, /*23 */ 484 { 8, 7, 23, 26, 36}, // 23
511 {6, 6, 20, 22, 46}, /*24 */ 485 { 6, 6, 20, 22, 46}, // 24
512 {4, 5, 17, 18, 56}, /*25 */ 486 { 4, 5, 17, 18, 56}, // 25
513 {2, 4, 12, 14, 68}, /*26 */ 487 { 2, 4, 12, 14, 68}, // 26
514 {0, 3, 7, 10, 80}, /*27 */ 488 { 0, 3, 7, 10, 80}, // 27
515 {0, 0, 3, 7, 90}, /*28 */ 489 { 0, 0, 3, 7, 90}, // 28
516 {0, 0, 0, 3, 97}, /*29 */ 490 { 0, 0, 0, 3, 97}, // 29
517 {0, 0, 0, 0, 100}, /*30 */ 491 { 0, 0, 0, 0, 100}, // 30
518 {0, 0, 0, 0, 100}, /*31 */ 492 { 0, 0, 0, 0, 100}, // 31
519}; 493};
520
521 494
522/* calculate the appropriate level for wands staves and scrolls. 495/* calculate the appropriate level for wands staves and scrolls.
523 * 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)
524 * 497 *
525 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
526 * 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.
527 */ 500 */
528 501static int
529int
530level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
531{ 503{
532 int olevel = 0;
533
534 if (!op->inv) 504 if (!op->inv)
535 { 505 {
536 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);
537 return 0; 507 return 0;
538 } 508 }
539 509
540 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
541 511
542 if (olevel <= 0) 512 if (olevel <= 0)
543 olevel = rndm (1, MIN (op->inv->level, 1)); 513 olevel = rndm (1, op->inv->level);
544 514
545 if (olevel > MAXLEVEL) 515 return min (olevel, MAXLEVEL_TREASURE);
546 olevel = MAXLEVEL;
547
548 return olevel;
549} 516}
550 517
551/* 518/*
552 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
553 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
556 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
557 * 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
558 * weird integer between 1-31. 525 * weird integer between 1-31.
559 * 526 *
560 */ 527 */
561 528static int
562int
563magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
564{ 530{
565 int percent = 0, magic = 0;
566 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);
567 533
568 scaled_diff--;
569
570 if (scaled_diff < 0)
571 scaled_diff = 0;
572
573 if (scaled_diff >= DIFFLEVELS)
574 scaled_diff = DIFFLEVELS - 1;
575
576 percent = rndm (100); 534 int percent = rndm (100);
535 int magic;
577 536
578 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 537 for (magic = 0; magic <= MAXMAGIC; magic++)
579 { 538 {
580 percent -= difftomagic_list[scaled_diff][magic]; 539 percent -= difftomagic_list[scaled_diff][magic];
581 540
582 if (percent < 0) 541 if (percent < 0)
583 break; 542 break;
584 } 543 }
585 544
586 if (magic == (MAXMAGIC + 1)) 545 if (magic > MAXMAGIC)
587 { 546 {
588 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);
589 magic = 0; 548 magic = 0;
590 } 549 }
591 550
… …
599 * Sets magical bonus in an object, and recalculates the effect on 558 * Sets magical bonus in an object, and recalculates the effect on
600 * the armour variable, and the effect on speed of armour. 559 * the armour variable, and the effect on speed of armour.
601 * This function doesn't work properly, should add use of archetypes 560 * This function doesn't work properly, should add use of archetypes
602 * to make it truly absolute. 561 * to make it truly absolute.
603 */ 562 */
604
605void 563void
606set_abs_magic (object *op, int magic) 564set_abs_magic (object *op, int magic)
607{ 565{
608 if (!magic) 566 if (!magic)
609 return; 567 return;
610 568
611 op->magic = magic; 569 op->magic = magic;
612 if (op->arch) 570 if (op->arch)
613 { 571 {
614 if (op->type == ARMOUR) 572 if (op->type == ARMOUR)
615 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 573 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616 574
617 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 575 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
618 magic = (-magic); 576 magic = (-magic);
577
619 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 578 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620 } 579 }
621 else 580 else
622 { 581 {
623 if (op->type == ARMOUR) 582 if (op->type == ARMOUR)
624 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 583 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
584
625 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 585 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
626 magic = (-magic); 586 magic = (-magic);
587
627 op->weight = (op->weight * (100 - magic * 10)) / 100; 588 op->weight = (op->weight * (100 - magic * 10)) / 100;
628 } 589 }
629} 590}
630 591
631/* 592/*
… …
634 */ 595 */
635 596
636static void 597static void
637set_magic (int difficulty, object *op, int max_magic, int flags) 598set_magic (int difficulty, object *op, int max_magic, int flags)
638{ 599{
639 int i;
640
641 i = magic_from_difficulty (difficulty); 600 int i = magic_from_difficulty (difficulty);
601
642 if ((flags & GT_ONLY_GOOD) && i < 0) 602 if ((flags & GT_ONLY_GOOD) && i < 0)
643 i = -i; 603 i = -i;
604
644 if (i > max_magic) 605 i = min (i, max_magic);
645 i = max_magic; 606
646 set_abs_magic (op, i); 607 set_abs_magic (op, i);
647 if (i < 0) 608 if (i < 0)
648 SET_FLAG (op, FLAG_CURSED); 609 op->set_flag (FLAG_CURSED);
649} 610}
650 611
651/* 612/*
652 * Randomly adds one magical ability to the given object. 613 * Randomly adds one magical ability to the given object.
653 * Modified for Partial Resistance in many ways: 614 * Modified for Partial Resistance in many ways:
654 * 1) Since rings can have multiple bonuses, if the same bonus 615 * 1) Since rings can have multiple bonuses, if the same bonus
655 * is rolled again, increase it - the bonuses now stack with 616 * is rolled again, increase it - the bonuses now stack with
656 * other bonuses previously rolled and ones the item might natively have. 617 * other bonuses previously rolled and ones the item might natively have.
657 * 2) Add code to deal with new PR method. 618 * 2) Add code to deal with new PR method.
658 */ 619 */
659 620static void
660void
661set_ring_bonus (object *op, int bonus) 621set_ring_bonus (object *op, int bonus)
662{ 622{
663
664 int r = rndm (bonus > 0 ? 25 : 11); 623 int r = rndm (bonus > 0 ? 25 : 11);
665 624
666 if (op->type == AMULET) 625 if (op->type == AMULET)
667 {
668 if (!(rndm (21))) 626 if (!rndm (21))
669 r = 20 + rndm (2); 627 r = 20 + rndm (2);
628 else if (rndm (2))
629 r = 10;
670 else 630 else
671 {
672 if (rndm (2))
673 r = 10;
674 else
675 r = 11 + rndm (9); 631 r = 11 + rndm (9);
676 }
677 }
678 632
679 switch (r) 633 switch (r)
680 { 634 {
681 /* 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,
682 * bonuses and penalties will stack and add to existing values. 636 * bonuses and penalties will stack and add to existing values.
683 * of the item. 637 * of the item.
684 */ 638 */
685 case 0: 639 case 0:
686 case 1: 640 case 1:
687 case 2: 641 case 2:
688 case 3: 642 case 3:
689 case 4: 643 case 4:
690 case 5: 644 case 5:
691 case 6: 645 case 6:
692 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 646 op->stats.stat (r) += bonus;
693 break; 647 break;
694 648
695 case 7: 649 case 7:
696 op->stats.dam += bonus; 650 op->stats.dam += bonus;
697 break; 651 break;
… …
729 * 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
730 * even values. 684 * even values.
731 */ 685 */
732 if (bonus < 0) 686 if (bonus < 0)
733 val = 2 * -val - rndm (b); 687 val = 2 * -val - rndm (b);
734 if (val > 35) 688
735 val = 35; /* Upper limit */ 689 val = min (35, val); /* Upper limit */
690
736 b = 0; 691 b = 0;
737 692
738 while (op->resist[resist_table[resist]] != 0 && b < 4) 693 while (op->resist[resist_table[resist]] != 0 && b < 4)
739 resist = rndm (num_resist_table); 694 resist = rndm (num_resist_table);
740 695
… …
748 break; 703 break;
749 } 704 }
750 case 20: 705 case 20:
751 if (op->type == AMULET) 706 if (op->type == AMULET)
752 { 707 {
753 SET_FLAG (op, FLAG_REFL_SPELL); 708 op->set_flag (FLAG_REFL_SPELL);
754 op->value *= 11; 709 op->value *= 11;
755 } 710 }
756 else 711 else
757 { 712 {
758 op->stats.hp = 1; /* regenerate hit points */ 713 op->stats.hp = 1; /* regenerate hit points */
… …
761 break; 716 break;
762 717
763 case 21: 718 case 21:
764 if (op->type == AMULET) 719 if (op->type == AMULET)
765 { 720 {
766 SET_FLAG (op, FLAG_REFL_MISSILE); 721 op->set_flag (FLAG_REFL_MISSILE);
767 op->value *= 9; 722 op->value *= 9;
768 } 723 }
769 else 724 else
770 { 725 {
771 op->stats.sp = 1; /* regenerate spell points */ 726 op->stats.sp = 1; /* regenerate spell points */
… …
773 } 728 }
774 break; 729 break;
775 730
776 case 22: 731 case 22:
777 op->stats.exp += bonus; /* Speed! */ 732 op->stats.exp += bonus; /* Speed! */
778 op->value = (op->value * 2) / 3; 733 op->value = op->value * 2 / 3;
779 break; 734 break;
780 } 735 }
781 736
782 if (bonus > 0) 737 if (bonus > 0)
783 op->value *= 2 * bonus; 738 op->value = 2 * op->value * bonus;
784 else 739 else
785 op->value = -(op->value * 2 * bonus) / 3; 740 op->value = -2 * op->value * bonus / 3;
786} 741}
787 742
788/* 743/*
789 * 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.
790 * 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
791 * higher is the chance of returning a low number. 746 * higher is the chance of returning a low number.
792 * 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
793 * rings and amulets. 748 * rings and amulets.
794 * 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.
795 */ 750 */
796int 751static int
797get_magic (int diff) 752get_magic (int diff)
798{ 753{
799 int i; 754 diff = min (3, diff);
800 755
801 if (diff < 3)
802 diff = 3;
803
804 for (i = 0; i < 4; i++) 756 for (int i = 0; i < 4; i++)
805 if (rndm (diff)) 757 if (rndm (diff))
806 return i; 758 return i;
807 759
808 return 4; 760 return 4;
809} 761}
810 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
780static double
781value_factor_from_spell_item (object *spell, object *item)
782{
783 double factor =
784 pow ((spell->value > 0 ? spell->value : 1)
785 * spell->level, 1.5);
786
787 if (item) // this if for: wands/staffs/rods:
788 {
789 /* Old crossfire comment ahead:
790 * Add 50 to both level an divisor to keep prices a little more
791 * reasonable. Otherwise, a high level version of a low level
792 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
793 * 10 time multiplier). This way, the value are a bit more reasonable.
794 */
795
796 factor *= item->level + 50;
797 factor /= item->inv->level + 50;
798 }
799
800 return factor;
801}
802
811#define DICE2 (get_magic(2)==2?2:1) 803#define DICE2 (get_magic(2) == 2 ? 2 : 1)
812#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 804#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
813 805
814/* 806/*
815 * fix_generated_item(): This is called after an item is generated, in 807 * fix_generated_item(): This is called after an item is generated, in
816 * order to set it up right. This produced magical bonuses, puts spells 808 * order to set it up right. This produced magical bonuses, puts spells
… …
831 * value. 823 * value.
832 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 824 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
833 * a working object - don't change magic, value, etc, but set it material 825 * a working object - don't change magic, value, etc, but set it material
834 * type as appropriate, for objects that need spell objects, set those, etc 826 * type as appropriate, for objects that need spell objects, set those, etc
835 */ 827 */
836
837void 828void
838fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 829fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
839{ 830{
840 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 831 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
841 832
… …
846 save_item_power = op->item_power; 837 save_item_power = op->item_power;
847 op->item_power = 0; 838 op->item_power = 0;
848 839
849 if (op->randomitems && op->type != SPELL) 840 if (op->randomitems && op->type != SPELL)
850 { 841 {
851 create_treasure (op->randomitems, op, flags, difficulty, 0); 842 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
852 if (!op->inv)
853 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
854
855 /* So the treasure doesn't get created again */ 843 /* So the treasure doesn't get created again */
856 op->randomitems = NULL; 844 op->randomitems = 0;
857 } 845 }
858 846
859 if (difficulty < 1) 847 max_it (difficulty, 1);
860 difficulty = 1;
861 848
862 if (INVOKE_OBJECT (ADD_BONUS, op, 849 if (INVOKE_OBJECT (ADD_BONUS, op,
863 ARG_OBJECT (creator != op ? creator : 0), 850 ARG_OBJECT (creator != op ? creator : 0),
864 ARG_INT (difficulty), ARG_INT (max_magic), 851 ARG_INT (difficulty), ARG_INT (max_magic),
865 ARG_INT (flags))) 852 ARG_INT (flags)))
866 return; 853 return;
867 854
868 if (!(flags & GT_MINIMAL)) 855 if (!(flags & GT_MINIMAL))
869 { 856 {
870 if (op->arch == crown_arch) 857 if (IS_ARCH (op->arch, crown))
871 { 858 {
872 set_magic (difficulty, op, max_magic, flags); 859 set_magic (difficulty, op, max_magic, flags);
873 num_enchantments = calc_item_power (op, 1); 860 num_enchantments = calc_item_power (op, 1);
874 generate_artifact (op, difficulty); 861 generate_artifact (op, difficulty);
875 } 862 }
… …
880 867
881 num_enchantments = calc_item_power (op, 1); 868 num_enchantments = calc_item_power (op, 1);
882 869
883 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 870 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
884 || op->type == HORN 871 || op->type == HORN
885 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 872 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
886 * used for shop_floors or treasures */
887 generate_artifact (op, difficulty); 873 generate_artifact (op, difficulty);
888 } 874 }
889 875
890 /* Object was made an artifact. Calculate its item_power rating. 876 /* Object was made an artifact. Calculate its item_power rating.
891 * the item_power in the object is what the artfiact adds. 877 * the item_power in the object is what the artfiact adds.
… …
925 * again below */ 911 * again below */
926 } 912 }
927 } 913 }
928 914
929 /* materialtype modifications. Note we allow this on artifacts. */ 915 /* materialtype modifications. Note we allow this on artifacts. */
930 set_materialname (op, difficulty, NULL); 916 select_material (op, difficulty);
931 917
932 if (flags & GT_MINIMAL) 918 if (flags & GT_MINIMAL)
933 { 919 {
934 if (op->type == POTION) 920 if (op->type == POTION)
935 /* Handle healing and magic power potions */ 921 /* Handle healing and magic power potions */
936 if (op->stats.sp && !op->randomitems) 922 if (op->stats.sp && !op->randomitems)
937 { 923 {
938 object *tmp;
939
940 tmp = get_archetype (spell_mapping[op->stats.sp]); 924 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
941 insert_ob_in_ob (tmp, op); 925 insert_ob_in_ob (tmp, op);
942 op->stats.sp = 0; 926 op->stats.sp = 0;
943 } 927 }
944 } 928 }
945 else if (!op->title) /* Only modify object if not special */ 929 else if (!op->title) /* Only modify object if not special */
… …
948 case WEAPON: 932 case WEAPON:
949 case ARMOUR: 933 case ARMOUR:
950 case SHIELD: 934 case SHIELD:
951 case HELMET: 935 case HELMET:
952 case CLOAK: 936 case CLOAK:
953 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 937 if (op->flag [FLAG_CURSED] && !(rndm (4)))
954 set_ring_bonus (op, -DICE2); 938 set_ring_bonus (op, -DICE2);
955 break; 939 break;
956 940
957 case BRACERS: 941 case BRACERS:
958 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) 942 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
959 { 943 {
960 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 944 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
961 if (!QUERY_FLAG (op, FLAG_CURSED)) 945 if (!op->flag [FLAG_CURSED])
962 op->value *= 3; 946 op->value *= 3;
963 } 947 }
964 break; 948 break;
965 949
966 case POTION: 950 case POTION:
967 { 951 {
968 int too_many_tries = 0, is_special = 0; 952 int too_many_tries = 0;
969 953
970 /* Handle healing and magic power potions */ 954 /* Handle healing and magic power potions */
971 if (op->stats.sp && !op->randomitems) 955 if (op->stats.sp && !op->randomitems)
972 { 956 {
973 object *tmp;
974
975 tmp = get_archetype (spell_mapping[op->stats.sp]); 957 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
976 insert_ob_in_ob (tmp, op); 958 insert_ob_in_ob (tmp, op);
977 op->stats.sp = 0; 959 op->stats.sp = 0;
978 } 960 }
979 961
980 while (!(is_special = special_potion (op)) && !op->inv) 962 while (!special_potion (op) && !op->inv)
981 { 963 {
982 generate_artifact (op, difficulty); 964 generate_artifact (op, difficulty);
983 if (too_many_tries++ > 10) 965 if (too_many_tries++ > 10)
984 break; 966 break;
985 } 967 }
… …
988 * since the value set on those is already correct. 970 * since the value set on those is already correct.
989 */ 971 */
990 if (op->inv && op->randomitems) 972 if (op->inv && op->randomitems)
991 { 973 {
992 /* value multiplier is same as for scrolls */ 974 /* value multiplier is same as for scrolls */
993 op->value = (op->value * op->inv->value); 975 op->value *= op->inv->value;
994 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 976 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
995 } 977 }
996 else 978 else
997 { 979 {
998 op->name = "potion"; 980 op->name = shstr_potion;
999 op->name_pl = "potions"; 981 op->name_pl = shstr_potions;
1000 } 982 }
1001 983
1002 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 984 if (!(flags & GT_ONLY_GOOD) && rndm (2))
1003 SET_FLAG (op, FLAG_CURSED); 985 op->set_flag (FLAG_CURSED);
986
1004 break; 987 break;
1005 } 988 }
1006 989
1007 case AMULET: 990 case AMULET:
1008 if (op->arch == amulet_arch) 991 if (IS_ARCH (op->arch, amulet))
1009 op->value *= 5; /* Since it's not just decoration */ 992 op->value *= 5; /* Since it's not just decoration */
1010 993
1011 case RING: 994 case RING:
1012 if (op->arch == NULL)
1013 {
1014 op->destroy ();
1015 op = 0;
1016 break;
1017 }
1018
1019 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 995 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1020 break; 996 break;
1021 997
1022 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 998 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1023 SET_FLAG (op, FLAG_CURSED); 999 op->set_flag (FLAG_CURSED);
1024 1000
1025 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1001 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1026 1002
1027 if (op->type != RING) /* Amulets have only one ability */ 1003 if (op->type != RING) /* Amulets have only one ability */
1028 break; 1004 break;
1029 1005
1030 if (!(rndm (4))) 1006 if (!rndm (4))
1031 { 1007 {
1032 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1008 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1033 1009
1034 if (d > 0) 1010 if (d > 0)
1035 op->value *= 3; 1011 op->value *= 3;
1036 1012
1037 set_ring_bonus (op, d); 1013 set_ring_bonus (op, d);
1038 1014
1039 if (!(rndm (4))) 1015 if (!rndm (4))
1040 { 1016 {
1041 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1017 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1042 1018
1043 if (d > 0) 1019 if (d > 0)
1044 op->value *= 5; 1020 op->value *= 5;
1021
1045 set_ring_bonus (op, d); 1022 set_ring_bonus (op, d);
1046 } 1023 }
1047 } 1024 }
1048 1025
1049 if (GET_ANIM_ID (op)) 1026 if (op->animation_id)
1050 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1027 op->set_anim_frame (rndm (op->anim_frames ()));
1051 1028
1052 break; 1029 break;
1053 1030
1054 case BOOK: 1031 case BOOK:
1055 /* Is it an empty book?, if yes lets make a special· 1032 /* Is it an empty book?, if yes lets make a special·
… …
1057 * creator and/or map level we found it on. 1034 * creator and/or map level we found it on.
1058 */ 1035 */
1059 if (!op->msg && rndm (10)) 1036 if (!op->msg && rndm (10))
1060 { 1037 {
1061 /* set the book level properly */ 1038 /* set the book level properly */
1062 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1039 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1063 { 1040 {
1064 if (op->map && op->map->difficulty) 1041 if (op->map && op->map->difficulty)
1065 op->level = rndm (op->map->difficulty) + rndm (10) + 1; 1042 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1066 else 1043 else
1067 op->level = rndm (20) + 1; 1044 op->level = rndm (20) + 1;
… …
1070 op->level = rndm (creator->level); 1047 op->level = rndm (creator->level);
1071 1048
1072 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1049 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1073 /* books w/ info are worth more! */ 1050 /* books w/ info are worth more! */
1074 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1051 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1075 /* creator related stuff */
1076
1077 /* for library, chained books. Note that some monsters have no_pick
1078 * set - we don't want to set no pick in that case.
1079 */
1080 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1081 SET_FLAG (op, FLAG_NO_PICK);
1082 if (creator->slaying && !op->slaying) /* for check_inv floors */
1083 op->slaying = creator->slaying;
1084 1052
1085 /* add exp so reading it gives xp (once) */ 1053 /* add exp so reading it gives xp (once) */
1086 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1054 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1087 } 1055 }
1056
1057 /* creator related stuff */
1058
1059 /* for library, chained books. Note that some monsters have no_pick
1060 * set - we don't want to set no pick in that case.
1061 */
1062 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1063 op->set_flag (FLAG_NO_PICK);
1064 if (creator->slaying && !op->slaying) /* for check_inv floors */
1065 op->slaying = creator->slaying;
1088 break; 1066 break;
1089 1067
1090 case SPELLBOOK: 1068 case SPELLBOOK:
1091 op->value = op->value * op->inv->value; 1069 op->value *= value_factor_from_spell_item (op->inv, 0);
1070
1092 /* add exp so learning gives xp */ 1071 /* add exp so learning gives xp */
1093 op->level = op->inv->level; 1072 op->level = op->inv->level;
1094 op->stats.exp = op->value; 1073 op->stats.exp = op->value;
1095 break; 1074 break;
1096 1075
… …
1100 * and reset nrof. 1079 * and reset nrof.
1101 */ 1080 */
1102 op->stats.food = op->inv->nrof; 1081 op->stats.food = op->inv->nrof;
1103 op->nrof = 1; 1082 op->nrof = 1;
1104 /* If the spell changes by level, choose a random level 1083 /* If the spell changes by level, choose a random level
1105 * for it, and adjust price. If the spell doesn't 1084 * for it.
1106 * change by level, just set the wand to the level of
1107 * the spell, and value calculation is simpler.
1108 */ 1085 */
1109 if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier) 1086 if (op->inv->duration_modifier
1110 { 1087 || op->inv->dam_modifier
1088 || op->inv->range_modifier)
1111 op->level = level_for_item (op, difficulty); 1089 op->level = level_for_item (op, difficulty);
1112 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1113 }
1114 else 1090 else
1115 {
1116 op->level = op->inv->level; 1091 op->level = op->inv->level;
1117 op->value = op->value * op->inv->value; 1092
1118 } 1093 op->value *= value_factor_from_spell_item (op->inv, op);
1119 break; 1094 break;
1120 1095
1121 case ROD: 1096 case ROD:
1122 op->level = level_for_item (op, difficulty); 1097 op->level = level_for_item (op, difficulty);
1123 /* Add 50 to both level an divisor to keep prices a little more 1098 op->value *= value_factor_from_spell_item (op->inv, op);
1124 * reasonable. Otherwise, a high level version of a low level 1099
1125 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1126 * 10 time multiplier). This way, the value are a bit more reasonable.
1127 */
1128 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1129 /* maxhp is used to denote how many 'charges' the rod holds before */ 1100 /* maxhp is used to denote how many 'charges' the rod holds before */
1130 if (op->stats.maxhp) 1101 if (op->stats.maxhp)
1131 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1102 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1132 else 1103 else
1133 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1104 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1134 1105
1135 op->stats.hp = op->stats.maxhp; 1106 op->stats.hp = op->stats.maxhp;
1136 break; 1107 break;
1137 1108
1138 case SCROLL: 1109 case SCROLL:
1139 op->level = level_for_item (op, difficulty); 1110 op->level = level_for_item (op, difficulty);
1140 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1111 op->value *= value_factor_from_spell_item (op->inv, op);
1141 1112
1142 /* add exp so reading them properly gives xp */ 1113 /* add exp so reading them properly gives xp */
1143 op->stats.exp = op->value / 5; 1114 op->stats.exp = op->value / 5;
1144 op->nrof = op->inv->nrof; 1115 op->nrof = op->inv->nrof;
1145 break; 1116 break;
… …
1153 break; 1124 break;
1154 } /* switch type */ 1125 } /* switch type */
1155 1126
1156 if (flags & GT_STARTEQUIP) 1127 if (flags & GT_STARTEQUIP)
1157 { 1128 {
1158 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1129 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1159 SET_FLAG (op, FLAG_STARTEQUIP); 1130 op->set_flag (FLAG_STARTEQUIP);
1160 else if (op->type != MONEY) 1131 else if (op->type != MONEY)
1161 op->value = 0; 1132 op->value = 0;
1162 } 1133 }
1163 1134
1164 if (!(flags & GT_ENVIRONMENT)) 1135 if (!(flags & GT_ENVIRONMENT))
… …
1174 */ 1145 */
1175 1146
1176/* 1147/*
1177 * Allocate and return the pointer to an empty artifactlist structure. 1148 * Allocate and return the pointer to an empty artifactlist structure.
1178 */ 1149 */
1179
1180static artifactlist * 1150static artifactlist *
1181get_empty_artifactlist (void) 1151get_empty_artifactlist ()
1182{ 1152{
1183 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1153 return salloc0<artifactlist> ();
1184
1185 if (al == NULL)
1186 fatal (OUT_OF_MEMORY);
1187 al->next = NULL;
1188 al->items = NULL;
1189 al->total_chance = 0;
1190 return al;
1191} 1154}
1192 1155
1193/* 1156/*
1194 * Allocate and return the pointer to an empty artifact structure. 1157 * Allocate and return the pointer to an empty artifact structure.
1195 */ 1158 */
1196
1197static artifact * 1159static artifact *
1198get_empty_artifact (void) 1160get_empty_artifact ()
1199{ 1161{
1200 artifact *a = (artifact *) malloc (sizeof (artifact)); 1162 return salloc0<artifact> ();
1201
1202 if (a == NULL)
1203 fatal (OUT_OF_MEMORY);
1204 a->item = NULL;
1205 a->next = NULL;
1206 a->chance = 0;
1207 a->difficulty = 0;
1208 a->allowed = NULL;
1209 return a;
1210} 1163}
1211 1164
1212/* 1165/*
1213 * Searches the artifact lists and returns one that has the same type 1166 * Searches the artifact lists and returns one that has the same type
1214 * of objects on it. 1167 * of objects on it.
1215 */ 1168 */
1216
1217artifactlist * 1169artifactlist *
1218find_artifactlist (int type) 1170find_artifactlist (int type)
1219{ 1171{
1220 artifactlist *al;
1221
1222 for (al = first_artifactlist; al != NULL; al = al->next) 1172 for (artifactlist *al = first_artifactlist; al; al = al->next)
1223 if (al->type == type) 1173 if (al->type == type)
1224 return al; 1174 return al;
1175
1225 return NULL; 1176 return 0;
1226} 1177}
1227 1178
1228/* 1179/*
1229 * For debugging purposes. Dumps all tables. 1180 * Builds up the lists of artifacts from the file in the libdir.
1230 */ 1181 */
1231
1232void 1182void
1233dump_artifacts (void)
1234{
1235 artifactlist *al;
1236 artifact *art;
1237 linked_char *next;
1238
1239 fprintf (logfile, "\n");
1240 for (al = first_artifactlist; al != NULL; al = al->next)
1241 {
1242 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1243 for (art = al->items; art != NULL; art = art->next)
1244 {
1245 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246 if (art->allowed != NULL)
1247 {
1248 fprintf (logfile, "\tAllowed combinations:");
1249 for (next = art->allowed; next != NULL; next = next->next)
1250 fprintf (logfile, "%s,", &next->name);
1251 fprintf (logfile, "\n");
1252 }
1253 }
1254 }
1255 fprintf (logfile, "\n");
1256}
1257
1258/*
1259 * For debugging purposes. Dumps all treasures recursively (see below).
1260 */
1261void
1262dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1263{
1264 treasurelist *tl;
1265 int i;
1266
1267 if (depth > 100)
1268 return;
1269 while (t)
1270 {
1271 if (t->name)
1272 {
1273 for (i = 0; i < depth; i++)
1274 fprintf (logfile, " ");
1275 fprintf (logfile, "{ (list: %s)\n", &t->name);
1276 tl = find_treasurelist (t->name);
1277 if (tl)
1278 dump_monster_treasure_rec (name, tl->items, depth + 2);
1279 for (i = 0; i < depth; i++)
1280 fprintf (logfile, " ");
1281 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282 }
1283 else
1284 {
1285 for (i = 0; i < depth; i++)
1286 fprintf (logfile, " ");
1287 if (t->item && t->item->clone.type == FLESH)
1288 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1289 else
1290 fprintf (logfile, "%s\n", &t->item->clone.name);
1291 }
1292
1293 if (t->next_yes)
1294 {
1295 for (i = 0; i < depth; i++)
1296 fprintf (logfile, " ");
1297 fprintf (logfile, " (if yes)\n");
1298 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1299 }
1300
1301 if (t->next_no)
1302 {
1303 for (i = 0; i < depth; i++)
1304 fprintf (logfile, " ");
1305 fprintf (logfile, " (if no)\n");
1306 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1307 }
1308
1309 t = t->next;
1310 }
1311}
1312
1313/*
1314 * For debugging purposes. Dumps all treasures for a given monster.
1315 * Created originally by Raphael Quinet for debugging the alchemy code.
1316 */
1317
1318void
1319dump_monster_treasure (const char *name)
1320{
1321 archetype *at;
1322 int found;
1323
1324 found = 0;
1325 fprintf (logfile, "\n");
1326 for (at = first_archetype; at != NULL; at = at->next)
1327 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1328 {
1329 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1330 if (at->clone.randomitems != NULL)
1331 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1332 else
1333 fprintf (logfile, "(nothing)\n");
1334 fprintf (logfile, "\n");
1335 found++;
1336 }
1337 if (found == 0)
1338 fprintf (logfile, "No objects have the name %s!\n\n", name);
1339}
1340
1341/*
1342 * Builds up the lists of artifacts from the file in the libdir.
1343 */
1344
1345void
1346init_artifacts (void) 1183init_artifacts ()
1347{ 1184{
1348 static int has_been_inited = 0; 1185 static int has_been_inited = 0;
1349 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;
1350 artifact *art = NULL; 1186 artifact *art = NULL;
1351 linked_char *tmp;
1352 int value;
1353 artifactlist *al; 1187 artifactlist *al;
1354 1188
1355 if (has_been_inited) 1189 if (has_been_inited)
1356 return; 1190 return;
1357 else 1191 else
1358 has_been_inited = 1; 1192 has_been_inited = 1;
1359 1193
1360 sprintf (filename, "%s/artifacts", settings.datadir); 1194 object_thawer f (settings.datadir, "artifacts");
1361 object_thawer thawer (filename);
1362 1195
1363 if (!thawer) 1196 if (!f)
1364 return; 1197 return;
1365 1198
1366 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1199 for (;;)
1367 { 1200 {
1368 if (*buf == '#') 1201 switch (f.kw)
1369 continue;
1370 if ((cp = strchr (buf, '\n')) != NULL)
1371 *cp = '\0';
1372 cp = buf;
1373 while (*cp == ' ') /* Skip blanks */
1374 cp++;
1375 if (*cp == '\0')
1376 continue;
1377
1378 if (!strncmp (cp, "Allowed", 7))
1379 { 1202 {
1203 case KW_allowed:
1380 if (art == NULL) 1204 if (!art)
1205 art = get_empty_artifact ();
1206
1381 { 1207 {
1382 art = get_empty_artifact (); 1208 if (!strcmp (f.get_str (), "all"))
1383 nrofartifacts++; 1209 break;
1210
1211 const char *cp = f.get_str ();
1212 char *next;
1213 do
1214 {
1215 if ((next = (char *)strchr (cp, ',')))
1216 *next++ = '\0';
1217
1218 linked_char *tmp = new linked_char;
1219
1220 tmp->name = cp;
1221 tmp->next = art->allowed;
1222 art->allowed = tmp;
1223 }
1224 while ((cp = next));
1384 } 1225 }
1385 cp = strchr (cp, ' ') + 1; 1226 break;
1386 if (!strcmp (cp, "all")) 1227
1228 case KW_chance:
1229 f.get (art->chance);
1230 break;
1231
1232 case KW_difficulty:
1233 f.get (art->difficulty);
1234 break;
1235
1236 case KW_object:
1237 {
1238 art->item = object::create ();
1239 f.get (art->item->name);
1240 f.next ();
1241
1242 if (!art->item->parse_kv (f))
1243 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1244
1245 al = find_artifactlist (art->item->type);
1246
1247 if (!al)
1248 {
1249 al = get_empty_artifactlist ();
1250 al->type = art->item->type;
1251 al->next = first_artifactlist;
1252 first_artifactlist = al;
1253 }
1254
1255 art->next = al->items;
1256 al->items = art;
1257 art = 0;
1258 }
1387 continue; 1259 continue;
1388 1260
1389 do 1261 case KW_EOF:
1262 goto done;
1263
1264 default:
1265 if (!f.parse_error ("artifacts file"))
1266 cleanup ("artifacts file required");
1390 { 1267 break;
1391 nrofallowedstr++;
1392 if ((next = strchr (cp, ',')) != NULL)
1393 *(next++) = '\0';
1394 tmp = new linked_char;
1395
1396 tmp->name = cp;
1397 tmp->next = art->allowed;
1398 art->allowed = tmp;
1399 }
1400 while ((cp = next) != NULL);
1401 }
1402 else if (sscanf (cp, "chance %d", &value))
1403 art->chance = (uint16) value;
1404 else if (sscanf (cp, "difficulty %d", &value))
1405 art->difficulty = (uint8) value;
1406 else if (!strncmp (cp, "Object", 6))
1407 { 1268 }
1408 art->item = object::create ();
1409 1269
1410 if (!load_object (thawer, art->item, 0)) 1270 f.next ();
1411 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1412
1413 art->item->name = strchr (cp, ' ') + 1;
1414 al = find_artifactlist (art->item->type);
1415 if (al == NULL)
1416 {
1417 al = get_empty_artifactlist ();
1418 al->type = art->item->type;
1419 al->next = first_artifactlist;
1420 first_artifactlist = al;
1421 }
1422 art->next = al->items;
1423 al->items = art;
1424 art = NULL;
1425 }
1426 else
1427 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1428 } 1271 }
1429 1272
1273done:
1430 for (al = first_artifactlist; al != NULL; al = al->next) 1274 for (al = first_artifactlist; al; al = al->next)
1431 { 1275 {
1276 al->total_chance = 0;
1277
1432 for (art = al->items; art != NULL; art = art->next) 1278 for (art = al->items; art; art = art->next)
1433 { 1279 {
1434 if (!art->chance) 1280 if (!art->chance)
1435 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1281 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1436 else 1282 else
1437 al->total_chance += art->chance; 1283 al->total_chance += art->chance;
1438 } 1284 }
1439#if 0 1285#if 0
1440 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance); 1286 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1441#endif 1287#endif
1442 } 1288 }
1443
1444 LOG (llevDebug, "done.\n");
1445} 1289}
1446
1447 1290
1448/* 1291/*
1449 * Used in artifact generation. The bonuses of the first object 1292 * Used in artifact generation. The bonuses of the first object
1450 * is modified by the bonuses of the second object. 1293 * is modified by the bonuses of the second object.
1451 */ 1294 */
1452
1453void 1295void
1454add_abilities (object *op, object *change) 1296add_abilities (object *op, object *change)
1455{ 1297{
1456 int i, tmp;
1457
1458 if (change->face != blank_face) 1298 if (change->face != blank_face)
1459 {
1460#ifdef TREASURE_VERBOSE
1461 LOG (llevDebug, "FACE: %d\n", change->face->number);
1462#endif
1463 op->face = change->face; 1299 op->face = change->face;
1464 }
1465 1300
1466 for (i = 0; i < NUM_STATS; i++) 1301 for (int i = 0; i < NUM_STATS; i++)
1467 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1302 change_attr_value (&(op->stats), i, change->stats.stat (i));
1468 1303
1469 op->attacktype |= change->attacktype; 1304 op->attacktype |= change->attacktype;
1470 op->path_attuned |= change->path_attuned; 1305 op->path_attuned |= change->path_attuned;
1471 op->path_repelled |= change->path_repelled; 1306 op->path_repelled |= change->path_repelled;
1472 op->path_denied |= change->path_denied; 1307 op->path_denied |= change->path_denied;
1473 op->move_type |= change->move_type; 1308 op->move_type |= change->move_type;
1474 op->stats.luck += change->stats.luck; 1309 op->stats.luck += change->stats.luck;
1475 1310
1476 if (QUERY_FLAG (change, FLAG_CURSED)) 1311 static const struct copyflags : object::flags_t
1477 SET_FLAG (op, FLAG_CURSED); 1312 {
1478 if (QUERY_FLAG (change, FLAG_DAMNED)) 1313 copyflags ()
1479 SET_FLAG (op, FLAG_DAMNED); 1314 {
1480 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1315 set (FLAG_CURSED);
1316 set (FLAG_DAMNED);
1317 set (FLAG_LIFESAVE);
1318 set (FLAG_REFL_SPELL);
1319 set (FLAG_STEALTH);
1320 set (FLAG_XRAYS);
1321 set (FLAG_BLIND);
1322 set (FLAG_SEE_IN_DARK);
1323 set (FLAG_REFL_MISSILE);
1324 set (FLAG_MAKE_INVIS);
1325 }
1326 } copyflags;
1327
1328 // we might want to just copy, but or'ing is what the original code did
1329 op->flag |= change->flag & copyflags;
1330
1331 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1481 set_abs_magic (op, -op->magic); 1332 set_abs_magic (op, -op->magic);
1482 1333
1483 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1334 if (change->flag [FLAG_STAND_STILL])
1484 SET_FLAG (op, FLAG_LIFESAVE);
1485 if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1486 SET_FLAG (op, FLAG_REFL_SPELL);
1487 if (QUERY_FLAG (change, FLAG_STEALTH))
1488 SET_FLAG (op, FLAG_STEALTH);
1489 if (QUERY_FLAG (change, FLAG_XRAYS))
1490 SET_FLAG (op, FLAG_XRAYS);
1491 if (QUERY_FLAG (change, FLAG_BLIND))
1492 SET_FLAG (op, FLAG_BLIND);
1493 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1494 SET_FLAG (op, FLAG_SEE_IN_DARK);
1495 if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1496 SET_FLAG (op, FLAG_REFL_MISSILE);
1497 if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1498 SET_FLAG (op, FLAG_MAKE_INVIS);
1499
1500 if (QUERY_FLAG (change, FLAG_STAND_STILL))
1501 { 1335 {
1502 CLEAR_FLAG (op, FLAG_ANIMATE); 1336 op->clr_flag (FLAG_ANIMATE);
1337
1503 /* so artifacts will join */ 1338 /* so artifacts will join */
1504 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1339 if (!op->flag [FLAG_ALIVE])
1505 op->speed = 0.0; 1340 op->speed = 0.;
1506 1341
1507 op->set_speed (op->speed); 1342 op->set_speed (op->speed);
1508 } 1343 }
1509 1344
1510 if (change->nrof) 1345 if (change->nrof)
1511 op->nrof = rndm (change->nrof) + 1; 1346 op->nrof = rndm (change->nrof) + 1;
1512 1347
1513 op->stats.exp += change->stats.exp; /* Speed modifier */ 1348 op->stats.exp += change->stats.exp; /* Speed modifier */
1514 op->stats.wc += change->stats.wc; 1349 op->stats.wc += change->stats.wc;
1515 op->stats.ac += change->stats.ac; 1350 op->stats.ac += change->stats.ac;
1516 1351
1517 if (change->other_arch) 1352 if (change->other_arch)
1518 { 1353 {
1519 /* Basically, for horns & potions, the other_arch field is the spell 1354 /* Basically, for horns & potions, the other_arch field is the spell
1520 * to cast. So convert that to into a spell and put it into 1355 * to cast. So convert that to into a spell and put it into
1521 * this object. 1356 * this object.
1522 */ 1357 */
1523 if (op->type == HORN || op->type == POTION) 1358 if (op->type == HORN || op->type == POTION)
1524 { 1359 {
1525 object *tmp_obj;
1526
1527 /* Remove any spells this object currently has in it */ 1360 /* Remove any spells this object currently has in it */
1528 while (op->inv)
1529 op->inv->destroy (); 1361 op->destroy_inv (false);
1530 1362
1531 tmp_obj = arch_to_object (change->other_arch); 1363 object *tmp = change->other_arch->instance ();
1532 insert_ob_in_ob (tmp_obj, op); 1364 insert_ob_in_ob (tmp, op);
1533 } 1365 }
1366
1534 /* No harm setting this for potions/horns */ 1367 /* No harm setting this for potions/horns */
1535 op->other_arch = change->other_arch; 1368 op->other_arch = change->other_arch;
1536 } 1369 }
1537 1370
1538 if (change->stats.hp < 0) 1371 if (change->stats.hp < 0)
… …
1554 op->stats.maxsp = -change->stats.maxsp; 1387 op->stats.maxsp = -change->stats.maxsp;
1555 else 1388 else
1556 op->stats.maxsp += change->stats.maxsp; 1389 op->stats.maxsp += change->stats.maxsp;
1557 1390
1558 if (change->stats.food < 0) 1391 if (change->stats.food < 0)
1559 op->stats.food = -(change->stats.food); 1392 op->stats.food = -change->stats.food;
1560 else 1393 else
1561 op->stats.food += change->stats.food; 1394 op->stats.food += change->stats.food;
1562 1395
1563 if (change->level < 0) 1396 if (change->level < 0)
1564 op->level = -(change->level); 1397 op->level = -change->level;
1565 else 1398 else
1566 op->level += change->level; 1399 op->level += change->level;
1567 1400
1568 if (change->gen_sp_armour < 0) 1401 if (change->gen_sp_armour < 0)
1569 op->gen_sp_armour = -(change->gen_sp_armour); 1402 op->gen_sp_armour = -change->gen_sp_armour;
1570 else 1403 else
1571 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1404 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1572 1405
1573 op->item_power = change->item_power; 1406 op->item_power = change->item_power;
1574 1407
1575 for (i = 0; i < NROFATTACKS; i++) 1408 for (int i = 0; i < NROFATTACKS; i++)
1576 if (change->resist[i])
1577 op->resist[i] += change->resist[i]; 1409 op->resist[i] += change->resist[i];
1578 1410
1579 if (change->stats.dam) 1411 if (change->stats.dam)
1580 { 1412 {
1581 if (change->stats.dam < 0) 1413 if (change->stats.dam < 0)
1582 op->stats.dam = (-change->stats.dam); 1414 op->stats.dam = -change->stats.dam;
1583 else if (op->stats.dam) 1415 else if (op->stats.dam)
1584 { 1416 {
1585 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1417 int tmp = op->stats.dam * change->stats.dam / 10;
1418
1586 if (tmp == op->stats.dam) 1419 if (tmp == op->stats.dam)
1587 { 1420 {
1588 if (change->stats.dam < 10) 1421 if (change->stats.dam < 10)
1589 op->stats.dam--; 1422 op->stats.dam--;
1590 else 1423 else
… …
1596 } 1429 }
1597 1430
1598 if (change->weight) 1431 if (change->weight)
1599 { 1432 {
1600 if (change->weight < 0) 1433 if (change->weight < 0)
1601 op->weight = (-change->weight); 1434 op->weight = -change->weight;
1602 else 1435 else
1603 op->weight = (op->weight * (change->weight)) / 100; 1436 op->weight = op->weight * change->weight / 100;
1604 } 1437 }
1605 1438
1606 if (change->last_sp) 1439 if (change->last_sp)
1607 { 1440 {
1608 if (change->last_sp < 0) 1441 if (change->last_sp < 0)
1609 op->last_sp = (-change->last_sp); 1442 op->last_sp = -change->last_sp;
1610 else 1443 else
1611 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1444 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1612 } 1445 }
1613 1446
1614 if (change->gen_sp_armour) 1447 if (change->gen_sp_armour)
1615 { 1448 {
1616 if (change->gen_sp_armour < 0) 1449 if (change->gen_sp_armour < 0)
1617 op->gen_sp_armour = (-change->gen_sp_armour); 1450 op->gen_sp_armour = -change->gen_sp_armour;
1618 else 1451 else
1619 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1452 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1620 } 1453 }
1621 1454
1622 op->value *= change->value; 1455 op->value *= change->value;
1623 1456
1624 if (change->material) 1457 if (change->materials)
1458 op->materials = change->materials;
1459
1460 if (change->material != MATERIAL_NULL)
1625 op->material = change->material; 1461 op->material = change->material;
1626
1627 if (change->materialname)
1628 op->materialname = change->materialname;
1629 1462
1630 if (change->slaying) 1463 if (change->slaying)
1631 op->slaying = change->slaying; 1464 op->slaying = change->slaying;
1632 1465
1633 if (change->race) 1466 if (change->race)
… …
1636 if (change->msg) 1469 if (change->msg)
1637 op->msg = change->msg; 1470 op->msg = change->msg;
1638} 1471}
1639 1472
1640static int 1473static int
1641legal_artifact_combination (object *op, artifact * art) 1474legal_artifact_combination (object *op, artifact *art)
1642{ 1475{
1643 int neg, success = 0; 1476 int neg, success = 0;
1644 linked_char *tmp; 1477 linked_char *tmp;
1645 const char *name; 1478 const char *name;
1646 1479
1647 if (art->allowed == (linked_char *) NULL) 1480 if (!art->allowed)
1648 return 1; /* Ie, "all" */ 1481 return 1; /* Ie, "all" */
1482
1649 for (tmp = art->allowed; tmp; tmp = tmp->next) 1483 for (tmp = art->allowed; tmp; tmp = tmp->next)
1650 { 1484 {
1651#ifdef TREASURE_VERBOSE 1485#ifdef TREASURE_VERBOSE
1652 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1486 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1653#endif 1487#endif
1654 if (*tmp->name == '!') 1488 if (*tmp->name == '!')
1655 name = tmp->name + 1, neg = 1; 1489 name = tmp->name + 1, neg = 1;
1656 else 1490 else
1657 name = tmp->name, neg = 0; 1491 name = tmp->name, neg = 0;
1658 1492
1659 /* If we match name, then return the opposite of 'neg' */ 1493 /* If we match name, then return the opposite of 'neg' */
1660 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1494 if (!strcmp (name, op->arch->archname))
1661 return !neg; 1495 return !neg;
1662 1496
1663 /* Set success as true, since if the match was an inverse, it means 1497 /* Set success as true, since if the match was an inverse, it means
1664 * everything is allowed except what we match 1498 * everything is allowed except what we match
1665 */ 1499 */
1666 else if (neg) 1500 else if (neg)
1667 success = 1; 1501 success = 1;
1668 } 1502 }
1503
1669 return success; 1504 return success;
1670} 1505}
1671 1506
1672/* 1507/*
1673 * Fixes the given object, giving it the abilities and titles 1508 * Fixes the given object, giving it the abilities and titles
… …
1675 */ 1510 */
1676 1511
1677void 1512void
1678give_artifact_abilities (object *op, object *artifct) 1513give_artifact_abilities (object *op, object *artifct)
1679{ 1514{
1680 char new_name[MAX_BUF]; 1515 op->title = format ("of %s", &artifct->name);
1681 1516
1682 sprintf (new_name, "of %s", &artifct->name);
1683 op->title = new_name;
1684 add_abilities (op, artifct); /* Give out the bonuses */ 1517 add_abilities (op, artifct); /* Give out the bonuses */
1685 1518
1686#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1519#if 0 /* Bit verbose, but keep it here until next time I need it... */
1687 { 1520 {
1688 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1521 char identified = op->flag [FLAG_IDENTIFIED];
1689 1522
1690 SET_FLAG (op, FLAG_IDENTIFIED); 1523 op->set_flag (FLAG_IDENTIFIED);
1691 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1524 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1692 if (!identified) 1525 if (!identified)
1693 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1526 op->clr_flag (FLAG_IDENTIFIED);
1694 } 1527 }
1695#endif 1528#endif
1696 return; 1529 return;
1697} 1530}
1698 1531
… …
1708#define ARTIFACT_TRIES 2 1541#define ARTIFACT_TRIES 2
1709 1542
1710void 1543void
1711generate_artifact (object *op, int difficulty) 1544generate_artifact (object *op, int difficulty)
1712{ 1545{
1713 artifactlist *al;
1714 artifact *art; 1546 artifact *art;
1715 int i;
1716 1547
1717 al = find_artifactlist (op->type); 1548 artifactlist *al = find_artifactlist (op->type);
1718 1549
1719 if (al == NULL) 1550 if (al == NULL)
1720 { 1551 {
1721#if 0 /* This is too verbose, usually */ 1552#if 0 /* This is too verbose, usually */
1722 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1553 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1723#endif 1554#endif
1724 return; 1555 return;
1725 } 1556 }
1726 1557
1727 for (i = 0; i < ARTIFACT_TRIES; i++) 1558 for (int i = 0; i < ARTIFACT_TRIES; i++)
1728 { 1559 {
1729 int roll = rndm (al->total_chance); 1560 int roll = rndm (al->total_chance);
1730 1561
1731 for (art = al->items; art; art = art->next) 1562 for (art = al->items; art; art = art->next)
1732 { 1563 {
… …
1740#if 1 1571#if 1
1741 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1572 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1742#endif 1573#endif
1743 return; 1574 return;
1744 } 1575 }
1745 if (!strcmp (art->item->name, "NONE")) 1576
1577 if (art->item->name == shstr_NONE)
1746 return; 1578 return;
1579
1747 if (FABS (op->magic) < art->item->magic) 1580 if (fabs (op->magic) < art->item->magic)
1748 continue; /* Not magic enough to be this item */ 1581 continue; /* Not magic enough to be this item */
1749 1582
1750 /* Map difficulty not high enough */ 1583 /* Map difficulty not high enough */
1751 if (difficulty < art->difficulty) 1584 if (difficulty < art->difficulty)
1752 continue; 1585 continue;
1753 1586
1754 if (!legal_artifact_combination (op, art)) 1587 if (!legal_artifact_combination (op, art))
1755 { 1588 {
1756#ifdef TREASURE_VERBOSE 1589#ifdef TREASURE_VERBOSE
1757 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1590 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1758#endif 1591#endif
1759 continue; 1592 continue;
1760 } 1593 }
1594
1761 give_artifact_abilities (op, art->item); 1595 give_artifact_abilities (op, art->item);
1762 return; 1596 return;
1763 } 1597 }
1764} 1598}
1765 1599
… …
1769 */ 1603 */
1770 1604
1771void 1605void
1772fix_flesh_item (object *item, object *donor) 1606fix_flesh_item (object *item, object *donor)
1773{ 1607{
1774 char tmpbuf[MAX_BUF];
1775 int i;
1776
1777 if (item->type == FLESH && donor) 1608 if (item->type == FLESH && donor)
1778 { 1609 {
1779 /* change the name */ 1610 /* change the name */
1780 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1611 item->name = format ("%s's %s", &donor->name, &item->name);
1781 item->name = tmpbuf;
1782 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1612 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1783 item->name_pl = tmpbuf;
1784 1613
1785 /* weight is FLESH weight/100 * donor */ 1614 /* weight is FLESH weight/100 * donor */
1786 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1615 item->weight = max (1, item->weight * donor->weight / 100);
1787 item->weight = 1;
1788 1616
1789 /* value is multiplied by level of donor */ 1617 /* value is multiplied by level of donor */
1790 item->value *= isqrt (donor->level * 2); 1618 item->value *= isqrt (donor->level * 2);
1791 1619
1792 /* food value */ 1620 /* food value */
1793 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1621 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1794 1622
1795 /* flesh items inherit some abilities of donor, but not 1623 /* flesh items inherit some abilities of donor, but not
1796 * full effect. 1624 * full effect.
1797 */ 1625 */
1798 for (i = 0; i < NROFATTACKS; i++) 1626 for (int i = 0; i < NROFATTACKS; i++)
1799 item->resist[i] = donor->resist[i] / 2; 1627 item->resist[i] = donor->resist[i] / 2;
1800 1628
1801 /* item inherits donor's level (important for quezals) */ 1629 /* item inherits donor's level (important for quezals) */
1802 item->level = donor->level; 1630 item->level = donor->level;
1803 1631
1804 /* if donor has some attacktypes, the flesh is poisonous */ 1632 /* if donor has some attacktypes, the flesh is poisonous */
1805 if (donor->attacktype & AT_POISON) 1633 if (donor->attacktype & AT_POISON)
1806 item->type = POISON; 1634 item->type = POISON;
1635
1807 if (donor->attacktype & AT_ACID) 1636 if (donor->attacktype & AT_ACID)
1808 item->stats.hp = -1 * item->stats.food; 1637 item->stats.hp = -item->stats.food;
1809 SET_FLAG (item, FLAG_NO_STEAL);
1810 }
1811}
1812 1638
1813/* special_potion() - so that old potion code is still done right. */ 1639 item->set_flag (FLAG_NO_STEAL);
1814 1640 }
1815int
1816special_potion (object *op)
1817{
1818 if (op->attacktype)
1819 return 1;
1820
1821 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1822 return 1;
1823
1824 for (int i = 0; i < NROFATTACKS; i++)
1825 if (op->resist[i])
1826 return 1;
1827
1828 return 0;
1829} 1641}
1830 1642
1831void 1643static void
1832free_treasurestruct (treasure *t) 1644free_treasurestruct (treasure *t)
1833{ 1645{
1834 if (t->next)
1835 free_treasurestruct (t->next); 1646 if (t->next) free_treasurestruct (t->next);
1836 if (t->next_yes)
1837 free_treasurestruct (t->next_yes); 1647 if (t->next_yes) free_treasurestruct (t->next_yes);
1838 if (t->next_no)
1839 free_treasurestruct (t->next_no); 1648 if (t->next_no) free_treasurestruct (t->next_no);
1840 1649
1841 delete t; 1650 delete t;
1842} 1651}
1843 1652
1844void 1653static void
1845free_charlinks (linked_char *lc) 1654free_charlinks (linked_char *lc)
1846{ 1655{
1847 if (lc->next) 1656 if (lc->next)
1848 free_charlinks (lc->next); 1657 free_charlinks (lc->next);
1849 1658
1850 delete lc; 1659 delete lc;
1851} 1660}
1852 1661
1853void 1662static void
1854free_artifact (artifact * at) 1663free_artifact (artifact *at)
1855{ 1664{
1856 if (at->next)
1857 free_artifact (at->next); 1665 if (at->next) free_artifact (at->next);
1858
1859 if (at->allowed)
1860 free_charlinks (at->allowed); 1666 if (at->allowed) free_charlinks (at->allowed);
1861 1667
1862 at->item->destroy (1); 1668 at->item->destroy ();
1863 1669
1864 delete at;
1865}
1866
1867void
1868free_artifactlist (artifactlist * al)
1869{
1870 artifactlist *nextal;
1871
1872 for (al = first_artifactlist; al; al = nextal)
1873 {
1874 nextal = al->next;
1875
1876 if (al->items)
1877 free_artifact (al->items);
1878
1879 free (al); 1670 sfree (at);
1880 }
1881} 1671}
1882 1672
1883void
1884free_all_treasures (void)
1885{
1886 treasurelist *tl, *next;
1887
1888
1889 for (tl = first_treasurelist; tl != NULL; tl = next)
1890 {
1891 next = tl->next;
1892 if (tl->items)
1893 free_treasurestruct (tl->items);
1894 delete tl;
1895 }
1896 free_artifactlist (first_artifactlist);
1897}

Diff Legend

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