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.29 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.63 by root, Mon Jun 4 13:04:00 2007 UTC

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

Diff Legend

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