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.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.57 by root, Tue Apr 24 00:42:02 2007 UTC

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

Diff Legend

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