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.17 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC

1
2/* 1/*
3 * static char *rcs_treasure_c =
4 * "$Id: treasure.C,v 1.17 2006/09/12 18:15:34 root Exp $";
5 */
6
7/*
8 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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[]; 46
47typedef std::tr1::unordered_map<
48 const char *,
49 treasurelist *,
50 str_hash,
51 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >,
53 true
54> tl_map_t;
55
56static tl_map_t tl_map;
51 57
52/* 58/*
53 * Initialize global archtype pointers: 59 * Initialize global archtype pointers:
54 */ 60 */
55
56void 61void
57init_archetype_pointers () 62init_archetype_pointers ()
58{ 63{
59 int prev_warn = warn_archetypes; 64 int prev_warn = warn_archetypes;
60 65
61 warn_archetypes = 1; 66 warn_archetypes = 1;
67
62 if (ring_arch == NULL) 68 if (ring_arch == NULL)
63 ring_arch = find_archetype ("ring"); 69 ring_arch = archetype::find ("ring");
64 if (amulet_arch == NULL) 70 if (amulet_arch == NULL)
65 amulet_arch = find_archetype ("amulet"); 71 amulet_arch = archetype::find ("amulet");
66 if (staff_arch == NULL) 72 if (staff_arch == NULL)
67 staff_arch = find_archetype ("staff"); 73 staff_arch = archetype::find ("staff");
68 if (crown_arch == NULL) 74 if (crown_arch == NULL)
69 crown_arch = find_archetype ("crown"); 75 crown_arch = archetype::find ("crown");
76
70 warn_archetypes = prev_warn; 77 warn_archetypes = prev_warn;
71} 78}
72 79
73/* 80/*
74 * Allocate and return the pointer to an empty treasurelist structure. 81 * Searches for the given treasurelist in the globally linked list
82 * of treasurelists which has been built by load_treasures().
75 */ 83 */
76
77static treasurelist * 84treasurelist *
78get_empty_treasurelist (void) 85treasurelist::find (const char *name)
79{ 86{
87 if (!name)
88 return 0;
89
90 AUTODECL (i, tl_map.find (name));
91
92 if (i == tl_map.end ())
93 return 0;
94
95 return i->second;
96}
97
98/*
99 * Searches for the given treasurelist in the globally linked list
100 * of treasurelists which has been built by load_treasures().
101 */
102treasurelist *
103treasurelist::get (const char *name)
104{
105 treasurelist *tl = find (name);
106
107 if (!tl)
108 {
80 return new treasurelist; 109 tl = new treasurelist;
81}
82 110
83/* 111 tl->name = name;
84 * Allocate and return the pointer to an empty treasure structure. 112 tl->next = first_treasurelist;
85 */ 113 first_treasurelist = tl;
86//TODO: make this a constructor
87static treasure *
88get_empty_treasure (void)
89{
90 treasure *t = new treasure;
91 114
92 t->chance = 100; 115 tl_map.insert (std::make_pair (tl->name, tl));
116 }
93 117
94 return t; 118 return tl;
119}
120
121//TODO: class method
122void
123clear (treasurelist *tl)
124{
125 if (tl->items)
126 {
127 free_treasurestruct (tl->items);
128 tl->items = 0;
129 }
95} 130}
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) 137load_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; 140 int value;
108 141
109 nroftreasures++; 142 nroftreasures++;
110 while (fgets (buf, MAX_BUF, fp) != NULL)
111 {
112 (*line)++;
113 143
114 if (*buf == '#') 144 for (;;)
115 continue; 145 {
116 if ((cp = strchr (buf, '\n')) != NULL) 146 coroapi::cede_every (10);
117 *cp = '\0';
118 cp = buf;
119 while (isspace (*cp)) /* Skip blanks */
120 cp++;
121 147
122 if (sscanf (cp, "arch %s", variable)) 148 f.next ();
123 { 149
124 if ((t->item = find_archetype (variable)) == NULL) 150 switch (f.kw)
125 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
126 } 151 {
127 else if (sscanf (cp, "list %s", variable)) 152 case KW_arch:
128 t->name = variable; 153 if (!(t->item = archetype::find (f.get_str ())))
129 else if (sscanf (cp, "change_name %s", variable)) 154 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
130 t->change_arch.name = variable; 155 break;
131 else if (sscanf (cp, "change_title %s", variable)) 156
132 t->change_arch.title = variable; 157 case KW_list: f.get (t->name); break;
133 else if (sscanf (cp, "change_slaying %s", variable)) 158 case KW_change_name: f.get (t->change_arch.name); break;
134 t->change_arch.slaying = variable; 159 case KW_change_title: f.get (t->change_arch.title); break;
135 else if (sscanf (cp, "chance %d", &value)) 160 case KW_change_slaying: f.get (t->change_arch.slaying); break;
136 t->chance = (uint8) value; 161 case KW_chance: f.get (t->chance); break;
137 else if (sscanf (cp, "nrof %d", &value)) 162 case KW_nrof: f.get (t->nrof); break;
138 t->nrof = (uint16) value; 163 case KW_magic: f.get (t->magic); break;
139 else if (sscanf (cp, "magic %d", &value)) 164
140 t->magic = (uint8) value; 165 case KW_yes: t->next_yes = load_treasure (f); break;
141 else if (!strcmp (cp, "yes")) 166 case KW_no: t->next_no = load_treasure (f); break;
142 t->next_yes = load_treasure (fp, line); 167
143 else if (!strcmp (cp, "no")) 168 case KW_end:
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; 169 return t;
170
171 case KW_more:
172 t->next = load_treasure (f);
173 return t;
174
175 default:
176 if (!f.parse_error ("treasure list"))
177 return t; // error
178
179 return t;
151 } 180 }
152 else
153 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
154 } 181 }
155 LOG (llevError, "treasure lacks 'end'.\n");
156 return t;
157} 182}
158 183
159#ifdef TREASURE_DEBUG 184#ifdef TREASURE_DEBUG
160
161/* recursived checks the linked list. Treasurelist is passed only 185/* recursived checks the linked list. Treasurelist is passed only
162 * so that the treasure name can be printed out 186 * so that the treasure name can be printed out
163 */ 187 */
164static void 188static void
165check_treasurelist (const treasure *t, const treasurelist * tl) 189check_treasurelist (const treasure *t, const treasurelist * tl)
166{ 190{
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)) 191 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); 192 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 */ 193
172 if (t->name && *t->name)
173 (void) find_treasurelist (t->name);
174 if (t->next) 194 if (t->next)
175 check_treasurelist (t->next, tl); 195 check_treasurelist (t->next, tl);
196
176 if (t->next_yes) 197 if (t->next_yes)
177 check_treasurelist (t->next_yes, tl); 198 check_treasurelist (t->next_yes, tl);
199
178 if (t->next_no) 200 if (t->next_no)
179 check_treasurelist (t->next_no, tl); 201 check_treasurelist (t->next_no, tl);
180} 202}
181#endif 203#endif
182 204
183/* 205/*
184 * Opens LIBDIR/treasure and reads all treasure-declarations from it. 206 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
185 * Each treasure is parsed with the help of load_treasure(). 207 * Each treasure is parsed with the help of load_treasure().
186 */ 208 */
187 209bool
188void
189load_treasures (void) 210load_treasures ()
190{ 211{
191 FILE *fp;
192 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
193 treasurelist *previous = NULL;
194 treasure *t; 212 treasure *t;
195 int comp, line = 0; 213 int comp, line = 0;
196 214
215 char filename[MAX_BUF];
197 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 216 sprintf (filename, "%s/%s", settings.datadir, settings.treasures);
198 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 217
218 object_thawer f (filename);
219
220 if (!f)
199 { 221 {
200 LOG (llevError, "Can't open treasure file.\n"); 222 LOG (llevError, "Can't open treasure file.\n");
201 return; 223 return false;
202 }
203 while (fgets (buf, MAX_BUF, fp) != NULL)
204 { 224 }
205 line++;
206 if (*buf == '#')
207 continue;
208 225
209 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) 226 f.next ();
210 {
211 treasurelist *tl = get_empty_treasurelist ();
212 227
213 tl->name = name; 228 for (;;)
214 if (previous == NULL) 229 {
215 first_treasurelist = tl; 230 switch (f.kw)
216 else 231 {
217 previous->next = tl; 232 case KW_treasure:
218 previous = tl; 233 case KW_treasureone:
219 tl->items = load_treasure (fp, &line);
220
221 /* 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
223 * fields of the treasures are not being used.
224 */
225 if (!strncmp (buf, "treasureone", 11))
226 { 234 {
227 for (t = tl->items; t != NULL; t = t->next) 235 bool one = f.kw == KW_treasureone;
236 treasurelist *tl = treasurelist::get (f.get_str ());
237
238 clear (tl);
239 tl->items = load_treasure (f);
240
241 if (!tl->items)
242 return false;
243
244 /* This is a one of the many items on the list should be generated.
245 * Add up the chance total, and check to make sure the yes & no
246 * fields of the treasures are not being used.
247 */
248 if (one)
228 { 249 {
250 for (t = tl->items; t; t = t->next)
251 {
229#ifdef TREASURE_DEBUG 252#ifdef TREASURE_DEBUG
230 if (t->next_yes || t->next_no) 253 if (t->next_yes || t->next_no)
231 { 254 {
232 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 255 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"); 256 LOG (llevError, " the next_yes or next_no field is set\n");
257 }
258#endif
259 tl->total_chance += t->chance;
234 } 260 }
235#endif
236 tl->total_chance += t->chance;
237 } 261 }
238 } 262 }
239 } 263 break;
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 264
265 case KW_EOF:
245#ifdef TREASURE_DEBUG 266#ifdef TREASURE_DEBUG
246 /* Perform some checks on how valid the treasure data actually is. 267 /* Perform some checks on how valid the treasure data actually is.
247 * verify that list transitions work (ie, the list that it is supposed 268 * verify that list transitions work (ie, the list that it is supposed
248 * to transition to exists). Also, verify that at least the name 269 * to transition to exists). Also, verify that at least the name
249 * or archetype is set for each treasure element. 270 * or archetype is set for each treasure element.
250 */ 271 */
251 for (previous = first_treasurelist; previous != NULL; previous = previous->next) 272 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
252 check_treasurelist (previous->items, previous); 273 check_treasurelist (tl->items, tl);
253#endif 274#endif
254}
255
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 shstr_cmp name_ (name);
265
266 if (!name_)
267 return 0;
268
269 for (treasurelist * tl = first_treasurelist; tl != 0; tl = tl->next)
270 if (name_ == tl->name)
271 return tl; 275 return true;
272 276
273 if (first_treasurelist) 277 default:
274 LOG (llevError, "Couldn't find treasurelist %s\n", name); 278 if (!f.parse_error ("treasure lists"))
279 return false;
275 280
276 return 0; 281 break;
277} 282 }
278 283
284 f.next ();
285 }
286}
279 287
280/* 288/*
281 * Generates the objects specified by the given treasure. 289 * Generates the objects specified by the given treasure.
282 * It goes recursively through the rest of the linked list. 290 * It goes recursively through the rest of the linked list.
283 * If there is a certain percental chance for a treasure to be generated, 291 * If there is a certain percental chance for a treasure to be generated,
… …
286 * being generated. 294 * being generated.
287 * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only 295 * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
288 * abilities. This is used by summon spells, thus no summoned monsters 296 * abilities. This is used by summon spells, thus no summoned monsters
289 * start with equipment, but only their abilities). 297 * start with equipment, but only their abilities).
290 */ 298 */
291
292
293static void 299static void
294put_treasure (object *op, object *creator, int flags) 300put_treasure (object *op, object *creator, int flags)
295{ 301{
296 object *tmp; 302 object *tmp;
297 303
… …
300 * this is the original object, or if this is an object that should be created 306 * this is the original object, or if this is an object that should be created
301 * by another object. 307 * by another object.
302 */ 308 */
303 if (flags & GT_ENVIRONMENT && op->type != SPELL) 309 if (flags & GT_ENVIRONMENT && op->type != SPELL)
304 { 310 {
305 op->x = creator->x;
306 op->y = creator->y;
307 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 311 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
308 insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 312 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
309 } 313 }
310 else 314 else
311 { 315 {
312 op = insert_ob_in_ob (op, creator); 316 op = creator->insert (op);
317
313 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 318 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
314 monster_check_apply (creator, op); 319 monster_check_apply (creator, op);
320
315 if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL) 321 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
316 esrv_send_item (tmp, op); 322 esrv_send_item (tmp, op);
317 } 323 }
318} 324}
319 325
320/* if there are change_xxx commands in the treasure, we include the changes 326/* if there are change_xxx commands in the treasure, we include the changes
… …
335 341
336 if (t->change_arch.slaying) 342 if (t->change_arch.slaying)
337 op->slaying = t->change_arch.slaying; 343 op->slaying = t->change_arch.slaying;
338} 344}
339 345
340void 346static void
341create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 347create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
342{ 348{
343 object *tmp;
344
345 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 349 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
346 { 350 {
347 if (t->name) 351 if (t->name)
348 { 352 {
349 if (strcmp (t->name, "NONE") && difficulty >= t->magic) 353 if (difficulty >= t->magic)
350 create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); 354 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);
351 } 355 }
352 else 356 else
353 { 357 {
354 if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)) 358 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
355 { 359 {
356 tmp = arch_to_object (t->item); 360 object *tmp = arch_to_object (t->item);
361
357 if (t->nrof && tmp->nrof <= 1) 362 if (t->nrof && tmp->nrof <= 1)
358 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 363 tmp->nrof = rndm (t->nrof) + 1;
364
359 fix_generated_item (tmp, op, difficulty, t->magic, flag); 365 fix_generated_item (tmp, op, difficulty, t->magic, flag);
360 change_treasure (t, tmp); 366 change_treasure (t, tmp);
361 put_treasure (tmp, op, flag); 367 put_treasure (tmp, op, flag);
362 } 368 }
363 } 369 }
364 370
365 if (t->next_yes != NULL) 371 if (t->next_yes)
366 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 372 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
367 } 373 }
368 else if (t->next_no != NULL) 374 else if (t->next_no)
369 create_all_treasures (t->next_no, op, flag, difficulty, tries); 375 create_all_treasures (t->next_no, op, flag, difficulty, tries);
370 376
371 if (t->next != NULL) 377 if (t->next)
372 create_all_treasures (t->next, op, flag, difficulty, tries); 378 create_all_treasures (t->next, op, flag, difficulty, tries);
373} 379}
374 380
375void 381static void
376create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 382create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
377{ 383{
378 int value = RANDOM () % tl->total_chance; 384 int value = rndm (tl->total_chance);
379 treasure *t; 385 treasure *t;
380 386
381 if (tries++ > 100) 387 if (tries++ > 100)
382 { 388 {
383 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 389 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
384 return; 390 return;
385 } 391 }
386 392
387 for (t = tl->items; t != NULL; t = t->next) 393 for (t = tl->items; t; t = t->next)
388 { 394 {
389 value -= t->chance; 395 value -= t->chance;
390 396
391 if (value < 0) 397 if (value < 0)
392 break; 398 break;
393 } 399 }
394 400
395 if (!t || value >= 0) 401 if (!t || value >= 0)
396 {
397 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 402 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
398 abort ();
399 return;
400 }
401 403
402 if (t->name) 404 if (t->name)
403 { 405 {
404 if (!strcmp (t->name, "NONE"))
405 return;
406
407 if (difficulty >= t->magic) 406 if (difficulty >= t->magic)
407 {
408 treasurelist *tl = treasurelist::find (t->name);
409 if (tl)
408 create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); 410 create_treasure (tl, op, flag, difficulty, tries);
411 }
409 else if (t->nrof) 412 else if (t->nrof)
410 create_one_treasure (tl, op, flag, difficulty, tries); 413 create_one_treasure (tl, op, flag, difficulty, tries);
411
412 return;
413 } 414 }
414
415 if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) 415 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
416 { 416 {
417 object *tmp = arch_to_object (t->item); 417 if (object *tmp = arch_to_object (t->item))
418 418 {
419 if (!tmp)
420 return;
421
422 if (t->nrof && tmp->nrof <= 1) 419 if (t->nrof && tmp->nrof <= 1)
423 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 420 tmp->nrof = rndm (t->nrof) + 1;
424 421
425 fix_generated_item (tmp, op, difficulty, t->magic, flag); 422 fix_generated_item (tmp, op, difficulty, t->magic, flag);
426 change_treasure (t, tmp); 423 change_treasure (t, tmp);
427 put_treasure (tmp, op, flag); 424 put_treasure (tmp, op, flag);
425 }
428 } 426 }
429} 427}
430 428
431/* This calls the appropriate treasure creation function. tries is passed 429/* This calls the appropriate treasure creation function. tries is passed
432 * to determine how many list transitions or attempts to create treasure 430 * to determine how many list transitions or attempts to create treasure
… …
434 * list transitions, or so that excessively good treasure will not be 432 * list transitions, or so that excessively good treasure will not be
435 * created on weak maps, because it will exceed the number of allowed tries 433 * created on weak maps, because it will exceed the number of allowed tries
436 * to do that. 434 * to do that.
437 */ 435 */
438void 436void
439create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries) 437create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
440{ 438{
439 // empty treasurelists are legal
440 if (!tl->items)
441 return;
441 442
442 if (tries++ > 100) 443 if (tries++ > 100)
443 { 444 {
444 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 445 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
445 return; 446 return;
446 } 447 }
448
447 if (t->total_chance) 449 if (tl->total_chance)
448 create_one_treasure (t, op, flag, difficulty, tries); 450 create_one_treasure (tl, op, flag, difficulty, tries);
449 else 451 else
450 create_all_treasures (t->items, op, flag, difficulty, tries); 452 create_all_treasures (tl->items, op, flag, difficulty, tries);
451} 453}
452 454
453/* This is similar to the old generate treasure function. However, 455/* This is similar to the old generate treasure function. However,
454 * it instead takes a treasurelist. It is really just a wrapper around 456 * it instead takes a treasurelist. It is really just a wrapper around
455 * create_treasure. We create a dummy object that the treasure gets 457 * create_treasure. We create a dummy object that the treasure gets
456 * inserted into, and then return that treausre 458 * inserted into, and then return that treausre
457 */ 459 */
458object * 460object *
459generate_treasure (treasurelist * t, int difficulty) 461generate_treasure (treasurelist *tl, int difficulty)
460{ 462{
463 difficulty = clamp (difficulty, 1, settings.max_level);
464
461 object *ob = get_object (), *tmp; 465 object *ob = object::create (), *tmp;
462 466
463 create_treasure (t, ob, 0, difficulty, 0); 467 create_treasure (tl, ob, 0, difficulty, 0);
464 468
465 /* Don't want to free the object we are about to return */ 469 /* Don't want to free the object we are about to return */
466 tmp = ob->inv; 470 tmp = ob->inv;
467 if (tmp != NULL) 471 if (tmp != NULL)
468 remove_ob (tmp); 472 tmp->remove ();
473
469 if (ob->inv) 474 if (ob->inv)
470 {
471 LOG (llevError, "In generate treasure, created multiple objects.\n"); 475 LOG (llevError, "In generate treasure, created multiple objects.\n");
472 } 476
473 free_object (ob); 477 ob->destroy ();
474 return tmp; 478 return tmp;
475} 479}
476 480
477/* 481/*
478 * This is a new way of calculating the chance for an item to have 482 * This is a new way of calculating the chance for an item to have
… …
481 * magical bonus "wanted". 485 * magical bonus "wanted".
482 */ 486 */
483 487
484static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 488static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
485 489
486/*chance of magic difficulty*/ 490// chance of magic difficulty
487
488/* +0 +1 +2 +3 +4 */ 491// +0 +1 +2 +3 +4
489 {95, 2, 2, 1, 0}, /*1 */ 492 {95, 2, 2, 1, 0}, // 1
490 {92, 5, 2, 1, 0}, /*2 */ 493 {92, 5, 2, 1, 0}, // 2
491 {85, 10, 4, 1, 0}, /*3 */ 494 {85, 10, 4, 1, 0}, // 3
492 {80, 14, 4, 2, 0}, /*4 */ 495 {80, 14, 4, 2, 0}, // 4
493 {75, 17, 5, 2, 1}, /*5 */ 496 {75, 17, 5, 2, 1}, // 5
494 {70, 18, 8, 3, 1}, /*6 */ 497 {70, 18, 8, 3, 1}, // 6
495 {65, 21, 10, 3, 1}, /*7 */ 498 {65, 21, 10, 3, 1}, // 7
496 {60, 22, 12, 4, 2}, /*8 */ 499 {60, 22, 12, 4, 2}, // 8
497 {55, 25, 14, 4, 2}, /*9 */ 500 {55, 25, 14, 4, 2}, // 9
498 {50, 27, 16, 5, 2}, /*10 */ 501 {50, 27, 16, 5, 2}, // 10
499 {45, 28, 18, 6, 3}, /*11 */ 502 {45, 28, 18, 6, 3}, // 11
500 {42, 28, 20, 7, 3}, /*12 */ 503 {42, 28, 20, 7, 3}, // 12
501 {40, 27, 21, 8, 4}, /*13 */ 504 {40, 27, 21, 8, 4}, // 13
502 {38, 25, 22, 10, 5}, /*14 */ 505 {38, 25, 22, 10, 5}, // 14
503 {36, 23, 23, 12, 6}, /*15 */ 506 {36, 23, 23, 12, 6}, // 15
504 {33, 21, 24, 14, 8}, /*16 */ 507 {33, 21, 24, 14, 8}, // 16
505 {31, 19, 25, 16, 9}, /*17 */ 508 {31, 19, 25, 16, 9}, // 17
506 {27, 15, 30, 18, 10}, /*18 */ 509 {27, 15, 30, 18, 10}, // 18
507 {20, 12, 30, 25, 13}, /*19 */ 510 {20, 12, 30, 25, 13}, // 19
508 {15, 10, 28, 30, 17}, /*20 */ 511 {15, 10, 28, 30, 17}, // 20
509 {13, 9, 27, 28, 23}, /*21 */ 512 {13, 9, 27, 28, 23}, // 21
510 {10, 8, 25, 28, 29}, /*22 */ 513 {10, 8, 25, 28, 29}, // 22
511 {8, 7, 23, 26, 36}, /*23 */ 514 { 8, 7, 23, 26, 36}, // 23
512 {6, 6, 20, 22, 46}, /*24 */ 515 { 6, 6, 20, 22, 46}, // 24
513 {4, 5, 17, 18, 56}, /*25 */ 516 { 4, 5, 17, 18, 56}, // 25
514 {2, 4, 12, 14, 68}, /*26 */ 517 { 2, 4, 12, 14, 68}, // 26
515 {0, 3, 7, 10, 80}, /*27 */ 518 { 0, 3, 7, 10, 80}, // 27
516 {0, 0, 3, 7, 90}, /*28 */ 519 { 0, 0, 3, 7, 90}, // 28
517 {0, 0, 0, 3, 97}, /*29 */ 520 { 0, 0, 0, 3, 97}, // 29
518 {0, 0, 0, 0, 100}, /*30 */ 521 { 0, 0, 0, 0, 100}, // 30
519 {0, 0, 0, 0, 100}, /*31 */ 522 { 0, 0, 0, 0, 100}, // 31
520}; 523};
521 524
522 525
523/* calculate the appropriate level for wands staves and scrolls. 526/* calculate the appropriate level for wands staves and scrolls.
524 * This code presumes that op has had its spell object created (in op->inv) 527 * This code presumes that op has had its spell object created (in op->inv)
… …
557 * elmex Thu Aug 10 18:45:44 CEST 2006: 560 * elmex Thu Aug 10 18:45:44 CEST 2006:
558 * Scaling difficulty by max_level, as difficulty is a level and not some 561 * Scaling difficulty by max_level, as difficulty is a level and not some
559 * weird integer between 1-31. 562 * weird integer between 1-31.
560 * 563 *
561 */ 564 */
562
563int 565int
564magic_from_difficulty (int difficulty) 566magic_from_difficulty (int difficulty)
565{ 567{
566 int percent = 0, magic = 0; 568 int percent = 0, magic = 0;
567 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 569 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
572 scaled_diff = 0; 574 scaled_diff = 0;
573 575
574 if (scaled_diff >= DIFFLEVELS) 576 if (scaled_diff >= DIFFLEVELS)
575 scaled_diff = DIFFLEVELS - 1; 577 scaled_diff = DIFFLEVELS - 1;
576 578
577 percent = RANDOM () % 100; 579 percent = rndm (100);
578 580
579 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 581 for (magic = 0; magic < (MAXMAGIC + 1); magic++)
580 { 582 {
581 percent -= difftomagic_list[scaled_diff][magic]; 583 percent -= difftomagic_list[scaled_diff][magic];
582 584
… …
588 { 590 {
589 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 591 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
590 magic = 0; 592 magic = 0;
591 } 593 }
592 594
593 magic = (RANDOM () % 3) ? magic : -magic; 595 magic = (rndm (3)) ? magic : -magic;
594 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ 596 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
595 597
596 return magic; 598 return magic;
597} 599}
598 600
… …
613 if (op->arch) 615 if (op->arch)
614 { 616 {
615 if (op->type == ARMOUR) 617 if (op->type == ARMOUR)
616 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 618 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
617 619
618 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 620 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
619 magic = (-magic); 621 magic = (-magic);
620 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 622 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
621 } 623 }
622 else 624 else
623 { 625 {
624 if (op->type == ARMOUR) 626 if (op->type == ARMOUR)
625 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 627 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
626 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 628 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
627 magic = (-magic); 629 magic = (-magic);
628 op->weight = (op->weight * (100 - magic * 10)) / 100; 630 op->weight = (op->weight * (100 - magic * 10)) / 100;
629 } 631 }
630} 632}
631 633
… …
655 * 1) Since rings can have multiple bonuses, if the same bonus 657 * 1) Since rings can have multiple bonuses, if the same bonus
656 * is rolled again, increase it - the bonuses now stack with 658 * is rolled again, increase it - the bonuses now stack with
657 * other bonuses previously rolled and ones the item might natively have. 659 * other bonuses previously rolled and ones the item might natively have.
658 * 2) Add code to deal with new PR method. 660 * 2) Add code to deal with new PR method.
659 */ 661 */
660
661void 662void
662set_ring_bonus (object *op, int bonus) 663set_ring_bonus (object *op, int bonus)
663{ 664{
664 665
665 int r = RANDOM () % (bonus > 0 ? 25 : 11); 666 int r = rndm (bonus > 0 ? 25 : 11);
666 667
667 if (op->type == AMULET) 668 if (op->type == AMULET)
668 { 669 {
669 if (!(RANDOM () % 21)) 670 if (!(rndm (21)))
670 r = 20 + RANDOM () % 2; 671 r = 20 + rndm (2);
671 else 672 else
672 { 673 {
673 if (RANDOM () & 2) 674 if (rndm (2))
674 r = 10; 675 r = 10;
675 else 676 else
676 r = 11 + RANDOM () % 9; 677 r = 11 + rndm (9);
677 } 678 }
678 } 679 }
679 680
680 switch (r) 681 switch (r)
681 { 682 {
… …
718 case 16: 719 case 16:
719 case 17: 720 case 17:
720 case 18: 721 case 18:
721 case 19: 722 case 19:
722 { 723 {
723 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 724 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
724 725
725 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 726 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
726 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 727 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
727 728
728 /* Cursed items need to have higher negative values to equal out with 729 /* Cursed items need to have higher negative values to equal out with
729 * positive values for how protections work out. Put another 730 * positive values for how protections work out. Put another
730 * little random element in since that they don't always end up with 731 * little random element in since that they don't always end up with
731 * even values. 732 * even values.
732 */ 733 */
733 if (bonus < 0) 734 if (bonus < 0)
734 val = 2 * -val - RANDOM () % b; 735 val = 2 * -val - rndm (b);
735 if (val > 35) 736 if (val > 35)
736 val = 35; /* Upper limit */ 737 val = 35; /* Upper limit */
737 b = 0; 738 b = 0;
739
738 while (op->resist[resist_table[resist]] != 0 && b < 4) 740 while (op->resist[resist_table[resist]] != 0 && b < 4)
739 {
740 resist = RANDOM () % num_resist_table; 741 resist = rndm (num_resist_table);
741 } 742
742 if (b == 4) 743 if (b == 4)
743 return; /* Not able to find a free resistance */ 744 return; /* Not able to find a free resistance */
745
744 op->resist[resist_table[resist]] = val; 746 op->resist[resist_table[resist]] = val;
745 /* We should probably do something more clever here to adjust value 747 /* We should probably do something more clever here to adjust value
746 * based on how good a resistance we gave. 748 * based on how good a resistance we gave.
747 */ 749 */
748 break; 750 break;
… …
776 case 22: 778 case 22:
777 op->stats.exp += bonus; /* Speed! */ 779 op->stats.exp += bonus; /* Speed! */
778 op->value = (op->value * 2) / 3; 780 op->value = (op->value * 2) / 3;
779 break; 781 break;
780 } 782 }
783
781 if (bonus > 0) 784 if (bonus > 0)
782 op->value *= 2 * bonus; 785 op->value *= 2 * bonus;
783 else 786 else
784 op->value = -(op->value * 2 * bonus) / 3; 787 op->value = -(op->value * 2 * bonus) / 3;
785} 788}
… …
790 * higher is the chance of returning a low number. 793 * higher is the chance of returning a low number.
791 * It is only used in fix_generated_treasure() to set bonuses on 794 * It is only used in fix_generated_treasure() to set bonuses on
792 * rings and amulets. 795 * rings and amulets.
793 * Another scheme is used to calculate the magic of weapons and armours. 796 * Another scheme is used to calculate the magic of weapons and armours.
794 */ 797 */
795
796int 798int
797get_magic (int diff) 799get_magic (int diff)
798{ 800{
799 int i; 801 int i;
800 802
801 if (diff < 3) 803 if (diff < 3)
802 diff = 3; 804 diff = 3;
805
803 for (i = 0; i < 4; i++) 806 for (i = 0; i < 4; i++)
804 if (RANDOM () % diff) 807 if (rndm (diff))
805 return i; 808 return i;
809
806 return 4; 810 return 4;
807} 811}
808 812
809#define DICE2 (get_magic(2)==2?2:1) 813#define DICE2 (get_magic(2)==2?2:1)
810#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 814#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
811 815
812/* 816/*
813 * fix_generated_item(): This is called after an item is generated, in 817 * fix_generated_item(): This is called after an item is generated, in
814 * order to set it up right. This produced magical bonuses, puts spells 818 * order to set it up right. This produced magical bonuses, puts spells
815 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 819 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
829 * value. 833 * value.
830 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 834 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
831 * a working object - don't change magic, value, etc, but set it material 835 * a working object - don't change magic, value, etc, but set it material
832 * type as appropriate, for objects that need spell objects, set those, etc 836 * type as appropriate, for objects that need spell objects, set those, etc
833 */ 837 */
834
835void 838void
836fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 839fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
837{ 840{
838 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 841 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
839 842
… …
846 849
847 if (op->randomitems && op->type != SPELL) 850 if (op->randomitems && op->type != SPELL)
848 { 851 {
849 create_treasure (op->randomitems, op, flags, difficulty, 0); 852 create_treasure (op->randomitems, op, flags, difficulty, 0);
850 if (!op->inv) 853 if (!op->inv)
851 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name); 854 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
852 855
853 /* So the treasure doesn't get created again */ 856 /* So the treasure doesn't get created again */
854 op->randomitems = NULL; 857 op->randomitems = 0;
855 } 858 }
856 859
857 if (difficulty < 1) 860 if (difficulty < 1)
858 difficulty = 1; 861 difficulty = 1;
862
863 if (INVOKE_OBJECT (ADD_BONUS, op,
864 ARG_OBJECT (creator != op ? creator : 0),
865 ARG_INT (difficulty), ARG_INT (max_magic),
866 ARG_INT (flags)))
867 return;
859 868
860 if (!(flags & GT_MINIMAL)) 869 if (!(flags & GT_MINIMAL))
861 { 870 {
862 if (op->arch == crown_arch) 871 if (op->arch == crown_arch)
863 { 872 {
… …
870 if (!op->magic && max_magic) 879 if (!op->magic && max_magic)
871 set_magic (difficulty, op, max_magic, flags); 880 set_magic (difficulty, op, max_magic, flags);
872 881
873 num_enchantments = calc_item_power (op, 1); 882 num_enchantments = calc_item_power (op, 1);
874 883
875 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 884 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
885 || op->type == HORN
886 || difficulty >= settings.max_level) /* high difficulties always generate an artifact,
876 * used for shop_floors or treasures */ 887 * used for shop_floors or treasures */
877 generate_artifact (op, difficulty); 888 generate_artifact (op, difficulty);
878 } 889 }
879 890
880 /* Object was made an artifact. Calculate its item_power rating. 891 /* Object was made an artifact. Calculate its item_power rating.
… …
938 case WEAPON: 949 case WEAPON:
939 case ARMOUR: 950 case ARMOUR:
940 case SHIELD: 951 case SHIELD:
941 case HELMET: 952 case HELMET:
942 case CLOAK: 953 case CLOAK:
943 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 954 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
944 set_ring_bonus (op, -DICE2); 955 set_ring_bonus (op, -DICE2);
945 break; 956 break;
946 957
947 case BRACERS: 958 case BRACERS:
948 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 959 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
949 { 960 {
950 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 961 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
951 if (!QUERY_FLAG (op, FLAG_CURSED)) 962 if (!QUERY_FLAG (op, FLAG_CURSED))
952 op->value *= 3; 963 op->value *= 3;
953 } 964 }
… …
979 */ 990 */
980 if (op->inv && op->randomitems) 991 if (op->inv && op->randomitems)
981 { 992 {
982 /* value multiplier is same as for scrolls */ 993 /* value multiplier is same as for scrolls */
983 op->value = (op->value * op->inv->value); 994 op->value = (op->value * op->inv->value);
984 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 995 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
985 } 996 }
986 else 997 else
987 { 998 {
988 op->name = "potion"; 999 op->name = "potion";
989 op->name_pl = "potions"; 1000 op->name_pl = "potions";
990 } 1001 }
991 1002
992 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 1003 if (!(flags & GT_ONLY_GOOD) && rndm (2))
993 SET_FLAG (op, FLAG_CURSED); 1004 SET_FLAG (op, FLAG_CURSED);
994 break; 1005 break;
995 } 1006 }
996 1007
997 case AMULET: 1008 case AMULET:
… …
999 op->value *= 5; /* Since it's not just decoration */ 1010 op->value *= 5; /* Since it's not just decoration */
1000 1011
1001 case RING: 1012 case RING:
1002 if (op->arch == NULL) 1013 if (op->arch == NULL)
1003 { 1014 {
1004 remove_ob (op); 1015 op->destroy ();
1005 free_object (op);
1006 op = NULL; 1016 op = 0;
1007 break; 1017 break;
1008 } 1018 }
1009 1019
1010 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 1020 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1011 break; 1021 break;
1012 1022
1013 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 1023 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1014 SET_FLAG (op, FLAG_CURSED); 1024 SET_FLAG (op, FLAG_CURSED);
1015 1025
1016 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1026 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1017 1027
1018 if (op->type != RING) /* Amulets have only one ability */ 1028 if (op->type != RING) /* Amulets have only one ability */
1019 break; 1029 break;
1020 1030
1021 if (!(RANDOM () % 4)) 1031 if (!(rndm (4)))
1022 { 1032 {
1023 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1033 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1024 1034
1025 if (d > 0) 1035 if (d > 0)
1026 op->value *= 3; 1036 op->value *= 3;
1027 1037
1028 set_ring_bonus (op, d); 1038 set_ring_bonus (op, d);
1029 1039
1030 if (!(RANDOM () % 4)) 1040 if (!(rndm (4)))
1031 { 1041 {
1032 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1042 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1033 1043
1034 if (d > 0) 1044 if (d > 0)
1035 op->value *= 5; 1045 op->value *= 5;
1036 set_ring_bonus (op, d); 1046 set_ring_bonus (op, d);
1037 } 1047 }
1038 } 1048 }
1039 1049
1040 if (GET_ANIM_ID (op)) 1050 if (GET_ANIM_ID (op))
1041 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1051 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1042 1052
1043 break; 1053 break;
1044 1054
1045 case BOOK: 1055 case BOOK:
1046 /* Is it an empty book?, if yes lets make a special· 1056 /* Is it an empty book?, if yes lets make a special·
1047 * msg for it, and tailor its properties based on the· 1057 * msg for it, and tailor its properties based on the·
1048 * creator and/or map level we found it on. 1058 * creator and/or map level we found it on.
1049 */ 1059 */
1050 if (!op->msg && RANDOM () % 10) 1060 if (!op->msg && rndm (10))
1051 { 1061 {
1052 /* set the book level properly */ 1062 /* set the book level properly */
1053 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1063 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1054 { 1064 {
1055 if (op->map && op->map->difficulty) 1065 if (op->map && op->map->difficulty)
1056 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1066 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1057 else 1067 else
1058 op->level = RANDOM () % 20 + 1; 1068 op->level = rndm (20) + 1;
1059 } 1069 }
1060 else 1070 else
1061 op->level = RANDOM () % creator->level; 1071 op->level = rndm (creator->level);
1062 1072
1063 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1073 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1064 /* books w/ info are worth more! */ 1074 /* books w/ info are worth more! */
1065 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1075 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1066 /* creator related stuff */ 1076 /* creator related stuff */
… …
1165 */ 1175 */
1166 1176
1167/* 1177/*
1168 * Allocate and return the pointer to an empty artifactlist structure. 1178 * Allocate and return the pointer to an empty artifactlist structure.
1169 */ 1179 */
1170
1171static artifactlist * 1180static artifactlist *
1172get_empty_artifactlist (void) 1181get_empty_artifactlist (void)
1173{ 1182{
1174 artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist)); 1183 return salloc0 <artifactlist> ();
1175
1176 if (tl == NULL)
1177 fatal (OUT_OF_MEMORY);
1178 tl->next = NULL;
1179 tl->items = NULL;
1180 tl->total_chance = 0;
1181 return tl;
1182} 1184}
1183 1185
1184/* 1186/*
1185 * Allocate and return the pointer to an empty artifact structure. 1187 * Allocate and return the pointer to an empty artifact structure.
1186 */ 1188 */
1187
1188static artifact * 1189static artifact *
1189get_empty_artifact (void) 1190get_empty_artifact (void)
1190{ 1191{
1191 artifact *t = (artifact *) malloc (sizeof (artifact)); 1192 return salloc0 <artifact> ();
1192
1193 if (t == NULL)
1194 fatal (OUT_OF_MEMORY);
1195 t->item = NULL;
1196 t->next = NULL;
1197 t->chance = 0;
1198 t->difficulty = 0;
1199 t->allowed = NULL;
1200 return t;
1201} 1193}
1202 1194
1203/* 1195/*
1204 * Searches the artifact lists and returns one that has the same type 1196 * Searches the artifact lists and returns one that has the same type
1205 * of objects on it. 1197 * of objects on it.
1206 */ 1198 */
1207
1208artifactlist * 1199artifactlist *
1209find_artifactlist (int type) 1200find_artifactlist (int type)
1210{ 1201{
1211 artifactlist *al;
1212
1213 for (al = first_artifactlist; al != NULL; al = al->next) 1202 for (artifactlist *al = first_artifactlist; al; al = al->next)
1214 if (al->type == type) 1203 if (al->type == type)
1215 return al; 1204 return al;
1205
1216 return NULL; 1206 return 0;
1217} 1207}
1218 1208
1219/* 1209/*
1220 * For debugging purposes. Dumps all tables. 1210 * For debugging purposes. Dumps all tables.
1221 */ 1211 */
1222
1223void 1212void
1224dump_artifacts (void) 1213dump_artifacts (void)
1225{ 1214{
1226 artifactlist *al; 1215 artifactlist *al;
1227 artifact *art; 1216 artifact *art;
… …
1234 for (art = al->items; art != NULL; art = art->next) 1223 for (art = al->items; art != NULL; art = art->next)
1235 { 1224 {
1236 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1225 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1237 if (art->allowed != NULL) 1226 if (art->allowed != NULL)
1238 { 1227 {
1239 fprintf (logfile, "\tAllowed combinations:"); 1228 fprintf (logfile, "\tallowed combinations:");
1240 for (next = art->allowed; next != NULL; next = next->next) 1229 for (next = art->allowed; next != NULL; next = next->next)
1241 fprintf (logfile, "%s,", &next->name); 1230 fprintf (logfile, "%s,", &next->name);
1242 fprintf (logfile, "\n"); 1231 fprintf (logfile, "\n");
1243 } 1232 }
1244 } 1233 }
… …
1255 treasurelist *tl; 1244 treasurelist *tl;
1256 int i; 1245 int i;
1257 1246
1258 if (depth > 100) 1247 if (depth > 100)
1259 return; 1248 return;
1260 while (t != NULL) 1249
1250 while (t)
1261 { 1251 {
1262 if (t->name != NULL) 1252 if (t->name)
1263 { 1253 {
1264 for (i = 0; i < depth; i++) 1254 for (i = 0; i < depth; i++)
1265 fprintf (logfile, " "); 1255 fprintf (logfile, " ");
1256
1266 fprintf (logfile, "{ (list: %s)\n", &t->name); 1257 fprintf (logfile, "{ (list: %s)\n", &t->name);
1258
1267 tl = find_treasurelist (t->name); 1259 tl = treasurelist::find (t->name);
1260 if (tl)
1268 dump_monster_treasure_rec (name, tl->items, depth + 2); 1261 dump_monster_treasure_rec (name, tl->items, depth + 2);
1262
1269 for (i = 0; i < depth; i++) 1263 for (i = 0; i < depth; i++)
1270 fprintf (logfile, " "); 1264 fprintf (logfile, " ");
1265
1271 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1266 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1272 } 1267 }
1273 else 1268 else
1274 { 1269 {
1275 for (i = 0; i < depth; i++) 1270 for (i = 0; i < depth; i++)
1276 fprintf (logfile, " "); 1271 fprintf (logfile, " ");
1272
1277 if (t->item->clone.type == FLESH) 1273 if (t->item && t->item->clone.type == FLESH)
1278 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1274 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1279 else 1275 else
1280 fprintf (logfile, "%s\n", &t->item->clone.name); 1276 fprintf (logfile, "%s\n", &t->item->clone.name);
1281 } 1277 }
1278
1282 if (t->next_yes != NULL) 1279 if (t->next_yes)
1283 { 1280 {
1284 for (i = 0; i < depth; i++) 1281 for (i = 0; i < depth; i++)
1285 fprintf (logfile, " "); 1282 fprintf (logfile, " ");
1283
1286 fprintf (logfile, " (if yes)\n"); 1284 fprintf (logfile, " (if yes)\n");
1287 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1285 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1288 } 1286 }
1287
1289 if (t->next_no != NULL) 1288 if (t->next_no)
1290 { 1289 {
1291 for (i = 0; i < depth; i++) 1290 for (i = 0; i < depth; i++)
1292 fprintf (logfile, " "); 1291 fprintf (logfile, " ");
1292
1293 fprintf (logfile, " (if no)\n"); 1293 fprintf (logfile, " (if no)\n");
1294 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1294 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1295 } 1295 }
1296
1296 t = t->next; 1297 t = t->next;
1297 } 1298 }
1298} 1299}
1299 1300
1300/* 1301/*
1301 * For debugging purposes. Dumps all treasures for a given monster. 1302 * For debugging purposes. Dumps all treasures for a given monster.
1302 * Created originally by Raphael Quinet for debugging the alchemy code. 1303 * Created originally by Raphael Quinet for debugging the alchemy code.
1303 */ 1304 */
1304
1305void 1305void
1306dump_monster_treasure (const char *name) 1306dump_monster_treasure (const char *name)
1307{ 1307{
1308 archetype *at; 1308 archetype *at;
1309 int found; 1309 int found;
1310 1310
1311 found = 0; 1311 found = 0;
1312 fprintf (logfile, "\n"); 1312 fprintf (logfile, "\n");
1313
1313 for (at = first_archetype; at != NULL; at = at->next) 1314 for (at = first_archetype; at != NULL; at = at->next)
1314 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1315 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1315 { 1316 {
1316 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1317 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1317 if (at->clone.randomitems != NULL) 1318 if (at->clone.randomitems != NULL)
1318 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1319 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1319 else 1320 else
1320 fprintf (logfile, "(nothing)\n"); 1321 fprintf (logfile, "(nothing)\n");
1322
1321 fprintf (logfile, "\n"); 1323 fprintf (logfile, "\n");
1322 found++; 1324 found++;
1323 } 1325 }
1326
1324 if (found == 0) 1327 if (found == 0)
1325 fprintf (logfile, "No objects have the name %s!\n\n", name); 1328 fprintf (logfile, "No objects have the name %s!\n\n", name);
1326} 1329}
1327 1330
1328/* 1331/*
1329 * Builds up the lists of artifacts from the file in the libdir. 1332 * Builds up the lists of artifacts from the file in the libdir.
1330 */ 1333 */
1331
1332void 1334void
1333init_artifacts (void) 1335init_artifacts (void)
1334{ 1336{
1335 static int has_been_inited = 0; 1337 static int has_been_inited = 0;
1336 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1338 char filename[MAX_BUF];
1337 artifact *art = NULL; 1339 artifact *art = NULL;
1338 linked_char *tmp;
1339 int value;
1340 artifactlist *al; 1340 artifactlist *al;
1341 1341
1342 if (has_been_inited) 1342 if (has_been_inited)
1343 return; 1343 return;
1344 else 1344 else
1345 has_been_inited = 1; 1345 has_been_inited = 1;
1346 1346
1347 sprintf (filename, "%s/artifacts", settings.datadir); 1347 sprintf (filename, "%s/artifacts", settings.datadir);
1348 object_thawer thawer (filename); 1348 object_thawer f (filename);
1349 1349
1350 if (!thawer) 1350 if (!f)
1351 return; 1351 return;
1352 1352
1353 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1353 f.next ();
1354 {
1355 if (*buf == '#')
1356 continue;
1357 if ((cp = strchr (buf, '\n')) != NULL)
1358 *cp = '\0';
1359 cp = buf;
1360 while (*cp == ' ') /* Skip blanks */
1361 cp++;
1362 if (*cp == '\0')
1363 continue;
1364 1354
1365 if (!strncmp (cp, "Allowed", 7)) 1355 for (;;)
1356 {
1357 switch (f.kw)
1366 { 1358 {
1359 case KW_allowed:
1367 if (art == NULL) 1360 if (!art)
1361 {
1362 art = get_empty_artifact ();
1363 nrofartifacts++;
1364 }
1365
1368 { 1366 {
1369 art = get_empty_artifact (); 1367 if (!strcmp (f.get_str (), "all"))
1370 nrofartifacts++; 1368 break;
1369
1370 char *next, *cp = f.get_str ();
1371
1372 do
1373 {
1374 nrofallowedstr++;
1375
1376 if ((next = strchr (cp, ',')))
1377 *next++ = '\0';
1378
1379 linked_char *tmp = new linked_char;
1380
1381 tmp->name = cp;
1382 tmp->next = art->allowed;
1383 art->allowed = tmp;
1384 }
1385 while ((cp = next));
1371 } 1386 }
1372 cp = strchr (cp, ' ') + 1; 1387 break;
1373 if (!strcmp (cp, "all")) 1388
1389 case KW_chance:
1390 f.get (art->chance);
1391 break;
1392
1393 case KW_difficulty:
1394 f.get (art->difficulty);
1395 break;
1396
1397 case KW_object:
1398 {
1399 art->item = object::create ();
1400
1401 if (!art->item->parse_kv (f))
1402 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1403
1404 al = find_artifactlist (art->item->type);
1405
1406 if (!al)
1407 {
1408 al = get_empty_artifactlist ();
1409 al->type = art->item->type;
1410 al->next = first_artifactlist;
1411 first_artifactlist = al;
1412 }
1413
1414 art->next = al->items;
1415 al->items = art;
1416 art = 0;
1417 }
1374 continue; 1418 continue;
1375 1419
1376 do 1420 case KW_EOF:
1421 goto done;
1422
1423 default:
1424 if (!f.parse_error ("artifacts file"))
1425 cleanup ("artifacts file required");
1377 { 1426 break;
1378 nrofallowedstr++;
1379 if ((next = strchr (cp, ',')) != NULL)
1380 *(next++) = '\0';
1381 tmp = new linked_char;
1382
1383 tmp->name = cp;
1384 tmp->next = art->allowed;
1385 art->allowed = tmp;
1386 }
1387 while ((cp = next) != NULL);
1388 }
1389 else if (sscanf (cp, "chance %d", &value))
1390 art->chance = (uint16) value;
1391 else if (sscanf (cp, "difficulty %d", &value))
1392 art->difficulty = (uint8) value;
1393 else if (!strncmp (cp, "Object", 6))
1394 { 1427 }
1395 art->item = get_object ();
1396 1428
1397 if (!load_object (thawer, art->item, 0)) 1429 f.next ();
1398 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1399
1400 art->item->name = strchr (cp, ' ') + 1;
1401 al = find_artifactlist (art->item->type);
1402 if (al == NULL)
1403 {
1404 al = get_empty_artifactlist ();
1405 al->type = art->item->type;
1406 al->next = first_artifactlist;
1407 first_artifactlist = al;
1408 }
1409 art->next = al->items;
1410 al->items = art;
1411 art = NULL;
1412 }
1413 else
1414 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1415 } 1430 }
1416 1431
1432done:
1417 for (al = first_artifactlist; al != NULL; al = al->next) 1433 for (al = first_artifactlist; al; al = al->next)
1418 { 1434 {
1419 for (art = al->items; art != NULL; art = art->next) 1435 for (art = al->items; art; art = art->next)
1420 { 1436 {
1421 if (!art->chance) 1437 if (!art->chance)
1422 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1438 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1423 else 1439 else
1424 al->total_chance += art->chance; 1440 al->total_chance += art->chance;
… …
1443 int i, tmp; 1459 int i, tmp;
1444 1460
1445 if (change->face != blank_face) 1461 if (change->face != blank_face)
1446 { 1462 {
1447#ifdef TREASURE_VERBOSE 1463#ifdef TREASURE_VERBOSE
1448 LOG (llevDebug, "FACE: %d\n", change->face->number); 1464 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1449#endif 1465#endif
1450 op->face = change->face; 1466 op->face = change->face;
1451 } 1467 }
1452 1468
1453 for (i = 0; i < NUM_STATS; i++) 1469 for (i = 0; i < NUM_STATS; i++)
… …
1489 CLEAR_FLAG (op, FLAG_ANIMATE); 1505 CLEAR_FLAG (op, FLAG_ANIMATE);
1490 /* so artifacts will join */ 1506 /* so artifacts will join */
1491 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1507 if (!QUERY_FLAG (op, FLAG_ALIVE))
1492 op->speed = 0.0; 1508 op->speed = 0.0;
1493 1509
1494 update_ob_speed (op); 1510 op->set_speed (op->speed);
1495 } 1511 }
1496 1512
1497 if (change->nrof) 1513 if (change->nrof)
1498 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1514 op->nrof = rndm (change->nrof) + 1;
1499 1515
1500 op->stats.exp += change->stats.exp; /* Speed modifier */ 1516 op->stats.exp += change->stats.exp; /* Speed modifier */
1501 op->stats.wc += change->stats.wc; 1517 op->stats.wc += change->stats.wc;
1502 op->stats.ac += change->stats.ac; 1518 op->stats.ac += change->stats.ac;
1503 1519
… …
1511 { 1527 {
1512 object *tmp_obj; 1528 object *tmp_obj;
1513 1529
1514 /* Remove any spells this object currently has in it */ 1530 /* Remove any spells this object currently has in it */
1515 while (op->inv) 1531 while (op->inv)
1516 { 1532 op->inv->destroy ();
1517 tmp_obj = op->inv;
1518 remove_ob (tmp_obj);
1519 free_object (tmp_obj);
1520 }
1521 1533
1522 tmp_obj = arch_to_object (change->other_arch); 1534 tmp_obj = arch_to_object (change->other_arch);
1523 insert_ob_in_ob (tmp_obj, op); 1535 insert_ob_in_ob (tmp_obj, op);
1524 } 1536 }
1525 /* No harm setting this for potions/horns */ 1537 /* No harm setting this for potions/horns */
… …
1562 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1574 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;
1563 1575
1564 op->item_power = change->item_power; 1576 op->item_power = change->item_power;
1565 1577
1566 for (i = 0; i < NROFATTACKS; i++) 1578 for (i = 0; i < NROFATTACKS; i++)
1567 {
1568 if (change->resist[i]) 1579 if (change->resist[i])
1569 {
1570 op->resist[i] += change->resist[i]; 1580 op->resist[i] += change->resist[i];
1571 }
1572 }
1573 1581
1574 if (change->stats.dam) 1582 if (change->stats.dam)
1575 { 1583 {
1576 if (change->stats.dam < 0) 1584 if (change->stats.dam < 0)
1577 op->stats.dam = (-change->stats.dam); 1585 op->stats.dam = (-change->stats.dam);
… …
1614 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1622 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1615 } 1623 }
1616 1624
1617 op->value *= change->value; 1625 op->value *= change->value;
1618 1626
1619 if (change->material) 1627 if (change->materials)
1620 op->material = change->material; 1628 op->materials = change->materials;
1621 1629
1622 if (change->materialname) 1630 if (change->materialname)
1623 op->materialname = change->materialname; 1631 op->materialname = change->materialname;
1624 1632
1625 if (change->slaying) 1633 if (change->slaying)
… …
1642 if (art->allowed == (linked_char *) NULL) 1650 if (art->allowed == (linked_char *) NULL)
1643 return 1; /* Ie, "all" */ 1651 return 1; /* Ie, "all" */
1644 for (tmp = art->allowed; tmp; tmp = tmp->next) 1652 for (tmp = art->allowed; tmp; tmp = tmp->next)
1645 { 1653 {
1646#ifdef TREASURE_VERBOSE 1654#ifdef TREASURE_VERBOSE
1647 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1655 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1648#endif 1656#endif
1649 if (*tmp->name == '!') 1657 if (*tmp->name == '!')
1650 name = tmp->name + 1, neg = 1; 1658 name = tmp->name + 1, neg = 1;
1651 else 1659 else
1652 name = tmp->name, neg = 0; 1660 name = tmp->name, neg = 0;
… …
1719 return; 1727 return;
1720 } 1728 }
1721 1729
1722 for (i = 0; i < ARTIFACT_TRIES; i++) 1730 for (i = 0; i < ARTIFACT_TRIES; i++)
1723 { 1731 {
1724 int roll = RANDOM () % al->total_chance; 1732 int roll = rndm (al->total_chance);
1725 1733
1726 for (art = al->items; art != NULL; art = art->next) 1734 for (art = al->items; art; art = art->next)
1727 { 1735 {
1728 roll -= art->chance; 1736 roll -= art->chance;
1729 if (roll < 0) 1737 if (roll < 0)
1730 break; 1738 break;
1731 } 1739 }
… …
1747 continue; 1755 continue;
1748 1756
1749 if (!legal_artifact_combination (op, art)) 1757 if (!legal_artifact_combination (op, art))
1750 { 1758 {
1751#ifdef TREASURE_VERBOSE 1759#ifdef TREASURE_VERBOSE
1752 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1760 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1753#endif 1761#endif
1754 continue; 1762 continue;
1755 } 1763 }
1764
1756 give_artifact_abilities (op, art->item); 1765 give_artifact_abilities (op, art->item);
1757 return; 1766 return;
1758 } 1767 }
1759} 1768}
1760 1769
… …
1808/* special_potion() - so that old potion code is still done right. */ 1817/* special_potion() - so that old potion code is still done right. */
1809 1818
1810int 1819int
1811special_potion (object *op) 1820special_potion (object *op)
1812{ 1821{
1813
1814 int i;
1815
1816 if (op->attacktype) 1822 if (op->attacktype)
1817 return 1; 1823 return 1;
1818 1824
1819 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha) 1825 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1820 return 1; 1826 return 1;
1821 1827
1822 for (i = 0; i < NROFATTACKS; i++) 1828 for (int i = 0; i < NROFATTACKS; i++)
1823 if (op->resist[i]) 1829 if (op->resist[i])
1824 return 1; 1830 return 1;
1825 1831
1826 return 0; 1832 return 0;
1827} 1833}
1828 1834
1829void 1835void
1830free_treasurestruct (treasure *t) 1836free_treasurestruct (treasure *t)
1831{ 1837{
1832 if (t->next)
1833 free_treasurestruct (t->next); 1838 if (t->next) free_treasurestruct (t->next);
1834 if (t->next_yes)
1835 free_treasurestruct (t->next_yes); 1839 if (t->next_yes) free_treasurestruct (t->next_yes);
1836 if (t->next_no)
1837 free_treasurestruct (t->next_no); 1840 if (t->next_no) free_treasurestruct (t->next_no);
1838 1841
1839 delete t; 1842 delete t;
1840} 1843}
1841 1844
1842void 1845void
… …
1847 1850
1848 delete lc; 1851 delete lc;
1849} 1852}
1850 1853
1851void 1854void
1852free_artifact (artifact * at) 1855free_artifact (artifact *at)
1853{ 1856{
1854 if (at->next)
1855 free_artifact (at->next); 1857 if (at->next) free_artifact (at->next);
1856
1857 if (at->allowed)
1858 free_charlinks (at->allowed); 1858 if (at->allowed) free_charlinks (at->allowed);
1859 1859
1860 at->item->free (1); 1860 at->item->destroy (1);
1861 1861
1862 delete at; 1862 sfree (at);
1863} 1863}
1864 1864
1865void 1865void
1866free_artifactlist (artifactlist * al) 1866free_artifactlist (artifactlist *al)
1867{ 1867{
1868 artifactlist *nextal; 1868 artifactlist *nextal;
1869 1869
1870 for (al = first_artifactlist; al != NULL; al = nextal) 1870 for (al = first_artifactlist; al; al = nextal)
1871 { 1871 {
1872 nextal = al->next; 1872 nextal = al->next;
1873 1873
1874 if (al->items) 1874 if (al->items)
1875 free_artifact (al->items); 1875 free_artifact (al->items);
1876 1876
1877 free (al); 1877 sfree (al);
1878 } 1878 }
1879} 1879}
1880 1880
1881void 1881void
1882free_all_treasures (void) 1882free_all_treasures (void)
1883{ 1883{
1884 treasurelist *tl, *next; 1884 treasurelist *tl, *next;
1885 1885
1886
1887 for (tl = first_treasurelist; tl != NULL; tl = next) 1886 for (tl = first_treasurelist; tl; tl = next)
1888 { 1887 {
1888 clear (tl);
1889
1889 next = tl->next; 1890 next = tl->next;
1890 if (tl->items)
1891 free_treasurestruct (tl->items);
1892 delete tl; 1891 delete tl;
1893 } 1892 }
1893
1894 free_artifactlist (first_artifactlist); 1894 free_artifactlist (first_artifactlist);
1895} 1895}

Diff Legend

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