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.39 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.45 by root, Mon Apr 16 15:41:26 2007 UTC

… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23 */ 23 */
24 24
25#define ALLOWED_COMBINATION
26
27/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
29 * slows the startup some (and not actual game play), it is by default 27 * slows the startup some (and not actual game play), it is by default
30 * left on 28 * left on
31 */ 29 */
32#define TREASURE_DEBUG 30#define TREASURE_DEBUG
33 31
34/* TREASURE_VERBOSE enables copious output concerning artifact generation */ 32/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35 33
36/* #define TREASURE_VERBOSE */ 34//#define TREASURE_VERBOSE
37 35
38#include <global.h> 36#include <global.h>
39#include <treasure.h> 37#include <treasure.h>
40#include <funcpoint.h> 38#include <funcpoint.h>
41#include <loader.h> 39#include <loader.h>
42 40
41extern char *spell_mapping[];
42
43static treasurelist *first_treasurelist;
43 44
44static void change_treasure (treasure *t, object *op); /* overrule default values */ 45static void change_treasure (treasure *t, object *op); /* overrule default values */
45extern 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;
46 57
47/* 58/*
48 * Initialize global archtype pointers: 59 * Initialize global archtype pointers:
49 */ 60 */
50
51void 61void
52init_archetype_pointers () 62init_archetype_pointers ()
53{ 63{
54 int prev_warn = warn_archetypes; 64 int prev_warn = warn_archetypes;
55 65
56 warn_archetypes = 1; 66 warn_archetypes = 1;
67
57 if (ring_arch == NULL) 68 if (ring_arch == NULL)
58 ring_arch = archetype::find ("ring"); 69 ring_arch = archetype::find ("ring");
59 if (amulet_arch == NULL) 70 if (amulet_arch == NULL)
60 amulet_arch = archetype::find ("amulet"); 71 amulet_arch = archetype::find ("amulet");
61 if (staff_arch == NULL) 72 if (staff_arch == NULL)
62 staff_arch = archetype::find ("staff"); 73 staff_arch = archetype::find ("staff");
63 if (crown_arch == NULL) 74 if (crown_arch == NULL)
64 crown_arch = archetype::find ("crown"); 75 crown_arch = archetype::find ("crown");
76
65 warn_archetypes = prev_warn; 77 warn_archetypes = prev_warn;
66} 78}
67 79
68/* 80/*
69 * Allocate and return the pointer to an empty treasurelist structure. 81 * Searches for the given treasurelist
70 */ 82 */
71
72static treasurelist * 83treasurelist *
73get_empty_treasurelist (void) 84treasurelist::find (const char *name)
74{ 85{
86 if (!name)
87 return 0;
88
89 auto (i, tl_map.find (name));
90
91 if (i == tl_map.end ())
92 return 0;
93
94 return i->second;
95}
96
97/*
98 * Searches for the given treasurelist in the globally linked list
99 * of treasurelists which has been built by load_treasures().
100 */
101treasurelist *
102treasurelist::get (const char *name)
103{
104 treasurelist *tl = find (name);
105
106 if (!tl)
107 {
75 return new treasurelist; 108 tl = new treasurelist;
76}
77 109
78/* 110 tl->name = name;
79 * Allocate and return the pointer to an empty treasure structure. 111 tl->next = first_treasurelist;
80 */ 112 first_treasurelist = tl;
81//TODO: make this a constructor
82static treasure *
83get_empty_treasure (void)
84{
85 treasure *t = new treasure;
86 113
87 t->chance = 100; 114 tl_map.insert (std::make_pair (tl->name, tl));
115 }
88 116
89 return t; 117 return tl;
118}
119
120//TODO: class method
121void
122clear (treasurelist *tl)
123{
124 if (tl->items)
125 {
126 free_treasurestruct (tl->items);
127 tl->items = 0;
128 }
129
130 tl->total_chance = 0;
90} 131}
91 132
92/* 133/*
93 * Reads the lib/treasure file from disk, and parses the contents 134 * Reads the lib/treasure file from disk, and parses the contents
94 * into an internal treasure structure (very linked lists) 135 * into an internal treasure structure (very linked lists)
95 */ 136 */
96
97static treasure * 137static treasure *
98load_treasure (FILE * fp, int *line) 138load_treasure (object_thawer &f)
99{ 139{
100 char buf[MAX_BUF], *cp, variable[MAX_BUF];
101 treasure *t = get_empty_treasure (); 140 treasure *t = new treasure;
102 int value; 141 int value;
103 142
104 nroftreasures++; 143 nroftreasures++;
105 while (fgets (buf, MAX_BUF, fp) != NULL)
106 {
107 (*line)++;
108 144
109 if (*buf == '#') 145 for (;;)
110 continue; 146 {
111 if ((cp = strchr (buf, '\n')) != NULL) 147 coroapi::cede_every (10);
112 *cp = '\0';
113 cp = buf;
114 while (isspace (*cp)) /* Skip blanks */
115 cp++;
116 148
117 if (sscanf (cp, "arch %s", variable)) 149 f.next ();
118 { 150
119 if ((t->item = archetype::find (variable)) == NULL) 151 switch (f.kw)
120 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121 } 152 {
122 else if (sscanf (cp, "list %s", variable)) 153 case KW_arch:
123 t->name = variable; 154 if (!(t->item = archetype::find (f.get_str ())))
124 else if (sscanf (cp, "change_name %s", variable)) 155 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
125 t->change_arch.name = variable; 156 break;
126 else if (sscanf (cp, "change_title %s", variable)) 157
127 t->change_arch.title = variable; 158 case KW_list: f.get (t->name); break;
128 else if (sscanf (cp, "change_slaying %s", variable)) 159 case KW_change_name: f.get (t->change_arch.name); break;
129 t->change_arch.slaying = variable; 160 case KW_change_title: f.get (t->change_arch.title); break;
130 else if (sscanf (cp, "chance %d", &value)) 161 case KW_change_slaying: f.get (t->change_arch.slaying); break;
131 t->chance = (uint8) value; 162 case KW_chance: f.get (t->chance); break;
132 else if (sscanf (cp, "nrof %d", &value)) 163 case KW_nrof: f.get (t->nrof); break;
133 t->nrof = (uint16) value; 164 case KW_magic: f.get (t->magic); break;
134 else if (sscanf (cp, "magic %d", &value)) 165
135 t->magic = (uint8) value; 166 case KW_yes: t->next_yes = load_treasure (f); break;
136 else if (!strcmp (cp, "yes")) 167 case KW_no: t->next_no = load_treasure (f); break;
137 t->next_yes = load_treasure (fp, line); 168
138 else if (!strcmp (cp, "no")) 169 case KW_end:
139 t->next_no = load_treasure (fp, line);
140 else if (!strcmp (cp, "end"))
141 return t;
142 else if (!strcmp (cp, "more"))
143 {
144 t->next = load_treasure (fp, line);
145 return t; 170 return t;
171
172 case KW_more:
173 t->next = load_treasure (f);
174 return t;
175
176 default:
177 if (!f.parse_error ("treasure list"))
178 return t; // error
179
180 return t;
146 } 181 }
147 else
148 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
149 } 182 }
150 LOG (llevError, "treasure lacks 'end'.\n");
151 return t;
152} 183}
153 184
154#ifdef TREASURE_DEBUG 185#ifdef TREASURE_DEBUG
155
156/* recursived checks the linked list. Treasurelist is passed only 186/* recursived checks the linked list. Treasurelist is passed only
157 * so that the treasure name can be printed out 187 * so that the treasure name can be printed out
158 */ 188 */
159static void 189static void
160check_treasurelist (const treasure *t, const treasurelist * tl) 190check_treasurelist (const treasure *t, const treasurelist * tl)
161{ 191{
162 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) 192 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
163 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); 193 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
164 /* find_treasurelist will print out its own error message */ 194
165 if (t->name && *t->name)
166 find_treasurelist (t->name);
167 if (t->next) 195 if (t->next)
168 check_treasurelist (t->next, tl); 196 check_treasurelist (t->next, tl);
197
169 if (t->next_yes) 198 if (t->next_yes)
170 check_treasurelist (t->next_yes, tl); 199 check_treasurelist (t->next_yes, tl);
200
171 if (t->next_no) 201 if (t->next_no)
172 check_treasurelist (t->next_no, tl); 202 check_treasurelist (t->next_no, tl);
173} 203}
174#endif 204#endif
175 205
176/* 206/*
177 * Opens LIBDIR/treasure and reads all treasure-declarations from it. 207 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
178 * Each treasure is parsed with the help of load_treasure(). 208 * Each treasure is parsed with the help of load_treasure().
179 */ 209 */
180 210bool
181void 211load_treasure_file (const char *filename)
182load_treasures (void)
183{ 212{
184 FILE *fp;
185 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186 treasurelist *previous = NULL;
187 treasure *t; 213 treasure *t;
188 int comp, line = 0; 214 int comp, line = 0;
189 215
190 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 216 object_thawer f (filename);
191 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 217
218 if (!f)
192 { 219 {
193 LOG (llevError, "Can't open treasure file.\n"); 220 LOG (llevError, "Can't open treasure file.\n");
194 return; 221 return false;
195 }
196 while (fgets (buf, MAX_BUF, fp) != NULL)
197 { 222 }
198 line++;
199 if (*buf == '#')
200 continue;
201 223
202 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) 224 f.next ();
203 {
204 treasurelist *tl = get_empty_treasurelist ();
205 225
206 tl->name = name; 226 for (;;)
207 if (previous == NULL) 227 {
208 first_treasurelist = tl; 228 switch (f.kw)
209 else 229 {
210 previous->next = tl; 230 case KW_treasure:
211 previous = tl; 231 case KW_treasureone:
212 tl->items = load_treasure (fp, &line);
213
214 /* This is a one of the many items on the list should be generated.
215 * Add up the chance total, and check to make sure the yes & no
216 * fields of the treasures are not being used.
217 */
218 if (!strncmp (buf, "treasureone", 11))
219 { 232 {
220 for (t = tl->items; t != NULL; t = t->next) 233 bool one = f.kw == KW_treasureone;
234 treasurelist *tl = treasurelist::get (f.get_str ());
235
236 clear (tl);
237 tl->items = load_treasure (f);
238
239 if (!tl->items)
240 return false;
241
242 /* This is a one of the many items on the list should be generated.
243 * Add up the chance total, and check to make sure the yes & no
244 * fields of the treasures are not being used.
245 */
246 if (one)
221 { 247 {
248 for (t = tl->items; t; t = t->next)
249 {
222#ifdef TREASURE_DEBUG 250#ifdef TREASURE_DEBUG
223 if (t->next_yes || t->next_no) 251 if (t->next_yes || t->next_no)
224 { 252 {
225 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 253 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
226 LOG (llevError, " the next_yes or next_no field is set\n"); 254 LOG (llevError, " the next_yes or next_no field is set\n");
255 }
256#endif
257 tl->total_chance += t->chance;
227 } 258 }
228#endif
229 tl->total_chance += t->chance;
230 } 259 }
231 } 260 }
232 } 261 break;
233 else
234 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
235 }
236 close_and_delete (fp, comp);
237 262
263 case KW_EOF:
238#ifdef TREASURE_DEBUG 264#ifdef TREASURE_DEBUG
239 /* Perform some checks on how valid the treasure data actually is. 265 /* Perform some checks on how valid the treasure data actually is.
240 * verify that list transitions work (ie, the list that it is supposed 266 * verify that list transitions work (ie, the list that it is supposed
241 * to transition to exists). Also, verify that at least the name 267 * to transition to exists). Also, verify that at least the name
242 * or archetype is set for each treasure element. 268 * or archetype is set for each treasure element.
243 */ 269 */
244 for (previous = first_treasurelist; previous != NULL; previous = previous->next) 270 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
245 check_treasurelist (previous->items, previous); 271 check_treasurelist (tl->items, tl);
246#endif 272#endif
247}
248
249/*
250 * Searches for the given treasurelist in the globally linked list
251 * of treasurelists which has been built by load_treasures().
252 */
253
254treasurelist *
255find_treasurelist (const char *name)
256{
257 shstr_cmp name_ (name);
258
259 if (!name_)
260 return 0;
261
262 for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
263 if (name_ == tl->name)
264 return tl; 273 return true;
265 274
266 if (first_treasurelist) 275 default:
267 LOG (llevError, "Couldn't find treasurelist %s\n", name); 276 if (!f.parse_error ("treasure lists"))
277 return false;
268 278
269 return 0; 279 break;
270} 280 }
271 281
282 f.next ();
283 }
284}
272 285
273/* 286/*
274 * Generates the objects specified by the given treasure. 287 * Generates the objects specified by the given treasure.
275 * It goes recursively through the rest of the linked list. 288 * It goes recursively through the rest of the linked list.
276 * If there is a certain percental chance for a treasure to be generated, 289 * If there is a certain percental chance for a treasure to be generated,
… …
326 339
327 if (t->change_arch.slaying) 340 if (t->change_arch.slaying)
328 op->slaying = t->change_arch.slaying; 341 op->slaying = t->change_arch.slaying;
329} 342}
330 343
331void 344static void
332create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 345create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
333{ 346{
334 object *tmp;
335
336 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 347 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
337 { 348 {
338 if (t->name) 349 if (t->name)
339 { 350 {
340 if (difficulty >= t->magic) 351 if (difficulty >= t->magic)
341 {
342 treasurelist *tl = find_treasurelist (t->name);
343 if (tl)
344 create_treasure (tl, op, flag, difficulty, tries); 352 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);
345 }
346 } 353 }
347 else 354 else
348 { 355 {
349 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 356 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350 { 357 {
351 tmp = arch_to_object (t->item); 358 object *tmp = arch_to_object (t->item);
359
352 if (t->nrof && tmp->nrof <= 1) 360 if (t->nrof && tmp->nrof <= 1)
353 tmp->nrof = rndm (t->nrof) + 1; 361 tmp->nrof = rndm (t->nrof) + 1;
354 362
355 fix_generated_item (tmp, op, difficulty, t->magic, flag); 363 fix_generated_item (tmp, op, difficulty, t->magic, flag);
356 change_treasure (t, tmp); 364 change_treasure (t, tmp);
357 put_treasure (tmp, op, flag); 365 put_treasure (tmp, op, flag);
358 } 366 }
359 } 367 }
360 368
361 if (t->next_yes != NULL) 369 if (t->next_yes)
362 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 370 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363 } 371 }
364 else if (t->next_no != NULL) 372 else if (t->next_no)
365 create_all_treasures (t->next_no, op, flag, difficulty, tries); 373 create_all_treasures (t->next_no, op, flag, difficulty, tries);
366 374
367 if (t->next != NULL) 375 if (t->next)
368 create_all_treasures (t->next, op, flag, difficulty, tries); 376 create_all_treasures (t->next, op, flag, difficulty, tries);
369} 377}
370 378
371void 379static void
372create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 380create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
373{ 381{
374 int value = rndm (tl->total_chance); 382 int value = rndm (tl->total_chance);
375 treasure *t; 383 treasure *t;
376 384
… …
378 { 386 {
379 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 387 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
380 return; 388 return;
381 } 389 }
382 390
383 for (t = tl->items; t != NULL; t = t->next) 391 for (t = tl->items; t; t = t->next)
384 { 392 {
385 value -= t->chance; 393 value -= t->chance;
386 394
387 if (value < 0) 395 if (value < 0)
388 break; 396 break;
389 } 397 }
390 398
391 if (!t || value >= 0) 399 if (!t || value >= 0)
392 {
393 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 400 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
394 abort ();
395 return;
396 }
397 401
398 if (t->name) 402 if (t->name)
399 { 403 {
400 if (difficulty >= t->magic) 404 if (difficulty >= t->magic)
401 { 405 {
402 treasurelist *tl = find_treasurelist (t->name); 406 treasurelist *tl = treasurelist::find (t->name);
403 if (tl) 407 if (tl)
404 create_treasure (tl, op, flag, difficulty, tries); 408 create_treasure (tl, op, flag, difficulty, tries);
405 } 409 }
406 else if (t->nrof) 410 else if (t->nrof)
407 create_one_treasure (tl, op, flag, difficulty, tries); 411 create_one_treasure (tl, op, flag, difficulty, tries);
408
409 return;
410 } 412 }
411
412 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 413 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
413 { 414 {
414 object *tmp = arch_to_object (t->item); 415 if (object *tmp = arch_to_object (t->item))
415 416 {
416 if (!tmp)
417 return;
418
419 if (t->nrof && tmp->nrof <= 1) 417 if (t->nrof && tmp->nrof <= 1)
420 tmp->nrof = rndm (t->nrof) + 1; 418 tmp->nrof = rndm (t->nrof) + 1;
421 419
422 fix_generated_item (tmp, op, difficulty, t->magic, flag); 420 fix_generated_item (tmp, op, difficulty, t->magic, flag);
423 change_treasure (t, tmp); 421 change_treasure (t, tmp);
424 put_treasure (tmp, op, flag); 422 put_treasure (tmp, op, flag);
423 }
425 } 424 }
426} 425}
427 426
428/* This calls the appropriate treasure creation function. tries is passed 427/* This calls the appropriate treasure creation function. tries is passed
429 * to determine how many list transitions or attempts to create treasure 428 * to determine how many list transitions or attempts to create treasure
… …
433 * to do that. 432 * to do that.
434 */ 433 */
435void 434void
436create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 435create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
437{ 436{
437 // empty treasurelists are legal
438 if (!tl->items)
439 return;
440
438 if (tries++ > 100) 441 if (tries++ > 100)
439 { 442 {
440 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 443 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441 return; 444 return;
442 } 445 }
… …
480 * magical bonus "wanted". 483 * magical bonus "wanted".
481 */ 484 */
482 485
483static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 486static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484 487
485/*chance of magic difficulty*/ 488// chance of magic difficulty
486
487/* +0 +1 +2 +3 +4 */ 489// +0 +1 +2 +3 +4
488 {95, 2, 2, 1, 0}, /*1 */ 490 {95, 2, 2, 1, 0}, // 1
489 {92, 5, 2, 1, 0}, /*2 */ 491 {92, 5, 2, 1, 0}, // 2
490 {85, 10, 4, 1, 0}, /*3 */ 492 {85, 10, 4, 1, 0}, // 3
491 {80, 14, 4, 2, 0}, /*4 */ 493 {80, 14, 4, 2, 0}, // 4
492 {75, 17, 5, 2, 1}, /*5 */ 494 {75, 17, 5, 2, 1}, // 5
493 {70, 18, 8, 3, 1}, /*6 */ 495 {70, 18, 8, 3, 1}, // 6
494 {65, 21, 10, 3, 1}, /*7 */ 496 {65, 21, 10, 3, 1}, // 7
495 {60, 22, 12, 4, 2}, /*8 */ 497 {60, 22, 12, 4, 2}, // 8
496 {55, 25, 14, 4, 2}, /*9 */ 498 {55, 25, 14, 4, 2}, // 9
497 {50, 27, 16, 5, 2}, /*10 */ 499 {50, 27, 16, 5, 2}, // 10
498 {45, 28, 18, 6, 3}, /*11 */ 500 {45, 28, 18, 6, 3}, // 11
499 {42, 28, 20, 7, 3}, /*12 */ 501 {42, 28, 20, 7, 3}, // 12
500 {40, 27, 21, 8, 4}, /*13 */ 502 {40, 27, 21, 8, 4}, // 13
501 {38, 25, 22, 10, 5}, /*14 */ 503 {38, 25, 22, 10, 5}, // 14
502 {36, 23, 23, 12, 6}, /*15 */ 504 {36, 23, 23, 12, 6}, // 15
503 {33, 21, 24, 14, 8}, /*16 */ 505 {33, 21, 24, 14, 8}, // 16
504 {31, 19, 25, 16, 9}, /*17 */ 506 {31, 19, 25, 16, 9}, // 17
505 {27, 15, 30, 18, 10}, /*18 */ 507 {27, 15, 30, 18, 10}, // 18
506 {20, 12, 30, 25, 13}, /*19 */ 508 {20, 12, 30, 25, 13}, // 19
507 {15, 10, 28, 30, 17}, /*20 */ 509 {15, 10, 28, 30, 17}, // 20
508 {13, 9, 27, 28, 23}, /*21 */ 510 {13, 9, 27, 28, 23}, // 21
509 {10, 8, 25, 28, 29}, /*22 */ 511 {10, 8, 25, 28, 29}, // 22
510 {8, 7, 23, 26, 36}, /*23 */ 512 { 8, 7, 23, 26, 36}, // 23
511 {6, 6, 20, 22, 46}, /*24 */ 513 { 6, 6, 20, 22, 46}, // 24
512 {4, 5, 17, 18, 56}, /*25 */ 514 { 4, 5, 17, 18, 56}, // 25
513 {2, 4, 12, 14, 68}, /*26 */ 515 { 2, 4, 12, 14, 68}, // 26
514 {0, 3, 7, 10, 80}, /*27 */ 516 { 0, 3, 7, 10, 80}, // 27
515 {0, 0, 3, 7, 90}, /*28 */ 517 { 0, 0, 3, 7, 90}, // 28
516 {0, 0, 0, 3, 97}, /*29 */ 518 { 0, 0, 0, 3, 97}, // 29
517 {0, 0, 0, 0, 100}, /*30 */ 519 { 0, 0, 0, 0, 100}, // 30
518 {0, 0, 0, 0, 100}, /*31 */ 520 { 0, 0, 0, 0, 100}, // 31
519}; 521};
520 522
521 523
522/* calculate the appropriate level for wands staves and scrolls. 524/* calculate the appropriate level for wands staves and scrolls.
523 * This code presumes that op has had its spell object created (in op->inv) 525 * This code presumes that op has had its spell object created (in op->inv)
… …
556 * elmex Thu Aug 10 18:45:44 CEST 2006: 558 * elmex Thu Aug 10 18:45:44 CEST 2006:
557 * Scaling difficulty by max_level, as difficulty is a level and not some 559 * Scaling difficulty by max_level, as difficulty is a level and not some
558 * weird integer between 1-31. 560 * weird integer between 1-31.
559 * 561 *
560 */ 562 */
561
562int 563int
563magic_from_difficulty (int difficulty) 564magic_from_difficulty (int difficulty)
564{ 565{
565 int percent = 0, magic = 0; 566 int percent = 0, magic = 0;
566 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 567 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
654 * 1) Since rings can have multiple bonuses, if the same bonus 655 * 1) Since rings can have multiple bonuses, if the same bonus
655 * is rolled again, increase it - the bonuses now stack with 656 * is rolled again, increase it - the bonuses now stack with
656 * other bonuses previously rolled and ones the item might natively have. 657 * other bonuses previously rolled and ones the item might natively have.
657 * 2) Add code to deal with new PR method. 658 * 2) Add code to deal with new PR method.
658 */ 659 */
659
660void 660void
661set_ring_bonus (object *op, int bonus) 661set_ring_bonus (object *op, int bonus)
662{ 662{
663 663
664 int r = rndm (bonus > 0 ? 25 : 11); 664 int r = rndm (bonus > 0 ? 25 : 11);
… …
847 847
848 if (op->randomitems && op->type != SPELL) 848 if (op->randomitems && op->type != SPELL)
849 { 849 {
850 create_treasure (op->randomitems, op, flags, difficulty, 0); 850 create_treasure (op->randomitems, op, flags, difficulty, 0);
851 if (!op->inv) 851 if (!op->inv)
852 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name); 852 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
853 853
854 /* So the treasure doesn't get created again */ 854 /* So the treasure doesn't get created again */
855 op->randomitems = NULL; 855 op->randomitems = 0;
856 } 856 }
857 857
858 if (difficulty < 1) 858 if (difficulty < 1)
859 difficulty = 1; 859 difficulty = 1;
860 860
… …
1176 * Allocate and return the pointer to an empty artifactlist structure. 1176 * Allocate and return the pointer to an empty artifactlist structure.
1177 */ 1177 */
1178static artifactlist * 1178static artifactlist *
1179get_empty_artifactlist (void) 1179get_empty_artifactlist (void)
1180{ 1180{
1181 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1181 return salloc0 <artifactlist> ();
1182
1183 if (al == NULL)
1184 fatal (OUT_OF_MEMORY);
1185 al->next = NULL;
1186 al->items = NULL;
1187 al->total_chance = 0;
1188 return al;
1189} 1182}
1190 1183
1191/* 1184/*
1192 * Allocate and return the pointer to an empty artifact structure. 1185 * Allocate and return the pointer to an empty artifact structure.
1193 */ 1186 */
1194static artifact * 1187static artifact *
1195get_empty_artifact (void) 1188get_empty_artifact (void)
1196{ 1189{
1197 artifact *a = (artifact *) malloc (sizeof (artifact)); 1190 return salloc0 <artifact> ();
1198
1199 if (a == NULL)
1200 fatal (OUT_OF_MEMORY);
1201
1202 a->item = NULL;
1203 a->next = NULL;
1204 a->chance = 0;
1205 a->difficulty = 0;
1206 a->allowed = NULL;
1207 return a;
1208} 1191}
1209 1192
1210/* 1193/*
1211 * Searches the artifact lists and returns one that has the same type 1194 * Searches the artifact lists and returns one that has the same type
1212 * of objects on it. 1195 * of objects on it.
1213 */ 1196 */
1214artifactlist * 1197artifactlist *
1215find_artifactlist (int type) 1198find_artifactlist (int type)
1216{ 1199{
1217 artifactlist *al;
1218
1219 for (al = first_artifactlist; al; al = al->next) 1200 for (artifactlist *al = first_artifactlist; al; al = al->next)
1220 if (al->type == type) 1201 if (al->type == type)
1221 return al; 1202 return al;
1222 1203
1223 return 0; 1204 return 0;
1224} 1205}
… …
1261 treasurelist *tl; 1242 treasurelist *tl;
1262 int i; 1243 int i;
1263 1244
1264 if (depth > 100) 1245 if (depth > 100)
1265 return; 1246 return;
1247
1266 while (t) 1248 while (t)
1267 { 1249 {
1268 if (t->name) 1250 if (t->name)
1269 { 1251 {
1270 for (i = 0; i < depth; i++) 1252 for (i = 0; i < depth; i++)
1271 fprintf (logfile, " "); 1253 fprintf (logfile, " ");
1254
1272 fprintf (logfile, "{ (list: %s)\n", &t->name); 1255 fprintf (logfile, "{ (list: %s)\n", &t->name);
1256
1273 tl = find_treasurelist (t->name); 1257 tl = treasurelist::find (t->name);
1274 if (tl) 1258 if (tl)
1275 dump_monster_treasure_rec (name, tl->items, depth + 2); 1259 dump_monster_treasure_rec (name, tl->items, depth + 2);
1260
1276 for (i = 0; i < depth; i++) 1261 for (i = 0; i < depth; i++)
1277 fprintf (logfile, " "); 1262 fprintf (logfile, " ");
1263
1278 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1264 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1279 } 1265 }
1280 else 1266 else
1281 { 1267 {
1282 for (i = 0; i < depth; i++) 1268 for (i = 0; i < depth; i++)
1283 fprintf (logfile, " "); 1269 fprintf (logfile, " ");
1270
1284 if (t->item && t->item->clone.type == FLESH) 1271 if (t->item && t->item->clone.type == FLESH)
1285 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1272 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1286 else 1273 else
1287 fprintf (logfile, "%s\n", &t->item->clone.name); 1274 fprintf (logfile, "%s\n", &t->item->clone.name);
1288 } 1275 }
1289 1276
1290 if (t->next_yes) 1277 if (t->next_yes)
1291 { 1278 {
1292 for (i = 0; i < depth; i++) 1279 for (i = 0; i < depth; i++)
1293 fprintf (logfile, " "); 1280 fprintf (logfile, " ");
1281
1294 fprintf (logfile, " (if yes)\n"); 1282 fprintf (logfile, " (if yes)\n");
1295 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1283 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1296 } 1284 }
1297 1285
1298 if (t->next_no) 1286 if (t->next_no)
1299 { 1287 {
1300 for (i = 0; i < depth; i++) 1288 for (i = 0; i < depth; i++)
1301 fprintf (logfile, " "); 1289 fprintf (logfile, " ");
1290
1302 fprintf (logfile, " (if no)\n"); 1291 fprintf (logfile, " (if no)\n");
1303 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1292 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1304 } 1293 }
1305 1294
1306 t = t->next; 1295 t = t->next;
… …
1309 1298
1310/* 1299/*
1311 * For debugging purposes. Dumps all treasures for a given monster. 1300 * For debugging purposes. Dumps all treasures for a given monster.
1312 * Created originally by Raphael Quinet for debugging the alchemy code. 1301 * Created originally by Raphael Quinet for debugging the alchemy code.
1313 */ 1302 */
1314
1315void 1303void
1316dump_monster_treasure (const char *name) 1304dump_monster_treasure (const char *name)
1317{ 1305{
1318 archetype *at; 1306 archetype *at;
1319 int found; 1307 int found;
… …
1469 int i, tmp; 1457 int i, tmp;
1470 1458
1471 if (change->face != blank_face) 1459 if (change->face != blank_face)
1472 { 1460 {
1473#ifdef TREASURE_VERBOSE 1461#ifdef TREASURE_VERBOSE
1474 LOG (llevDebug, "FACE: %d\n", change->face->number); 1462 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1475#endif 1463#endif
1476 op->face = change->face; 1464 op->face = change->face;
1477 } 1465 }
1478 1466
1479 for (i = 0; i < NUM_STATS; i++) 1467 for (i = 0; i < NUM_STATS; i++)
… …
1660 if (art->allowed == (linked_char *) NULL) 1648 if (art->allowed == (linked_char *) NULL)
1661 return 1; /* Ie, "all" */ 1649 return 1; /* Ie, "all" */
1662 for (tmp = art->allowed; tmp; tmp = tmp->next) 1650 for (tmp = art->allowed; tmp; tmp = tmp->next)
1663 { 1651 {
1664#ifdef TREASURE_VERBOSE 1652#ifdef TREASURE_VERBOSE
1665 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1653 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1666#endif 1654#endif
1667 if (*tmp->name == '!') 1655 if (*tmp->name == '!')
1668 name = tmp->name + 1, neg = 1; 1656 name = tmp->name + 1, neg = 1;
1669 else 1657 else
1670 name = tmp->name, neg = 0; 1658 name = tmp->name, neg = 0;
… …
1765 continue; 1753 continue;
1766 1754
1767 if (!legal_artifact_combination (op, art)) 1755 if (!legal_artifact_combination (op, art))
1768 { 1756 {
1769#ifdef TREASURE_VERBOSE 1757#ifdef TREASURE_VERBOSE
1770 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1758 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1771#endif 1759#endif
1772 continue; 1760 continue;
1773 } 1761 }
1762
1774 give_artifact_abilities (op, art->item); 1763 give_artifact_abilities (op, art->item);
1775 return; 1764 return;
1776 } 1765 }
1777} 1766}
1778 1767
… …
1842} 1831}
1843 1832
1844void 1833void
1845free_treasurestruct (treasure *t) 1834free_treasurestruct (treasure *t)
1846{ 1835{
1847 if (t->next)
1848 free_treasurestruct (t->next); 1836 if (t->next) free_treasurestruct (t->next);
1849 if (t->next_yes)
1850 free_treasurestruct (t->next_yes); 1837 if (t->next_yes) free_treasurestruct (t->next_yes);
1851 if (t->next_no)
1852 free_treasurestruct (t->next_no); 1838 if (t->next_no) free_treasurestruct (t->next_no);
1853 1839
1854 delete t; 1840 delete t;
1855} 1841}
1856 1842
1857void 1843void
… …
1862 1848
1863 delete lc; 1849 delete lc;
1864} 1850}
1865 1851
1866void 1852void
1867free_artifact (artifact * at) 1853free_artifact (artifact *at)
1868{ 1854{
1869 if (at->next)
1870 free_artifact (at->next); 1855 if (at->next) free_artifact (at->next);
1871
1872 if (at->allowed)
1873 free_charlinks (at->allowed); 1856 if (at->allowed) free_charlinks (at->allowed);
1874 1857
1875 at->item->destroy (1); 1858 at->item->destroy (1);
1876 1859
1877 delete at; 1860 sfree (at);
1878} 1861}
1879 1862
1880void 1863void
1881free_artifactlist (artifactlist * al) 1864free_artifactlist (artifactlist *al)
1882{ 1865{
1883 artifactlist *nextal; 1866 artifactlist *nextal;
1884 1867
1885 for (al = first_artifactlist; al; al = nextal) 1868 for (al = first_artifactlist; al; al = nextal)
1886 { 1869 {
1887 nextal = al->next; 1870 nextal = al->next;
1888 1871
1889 if (al->items) 1872 if (al->items)
1890 free_artifact (al->items); 1873 free_artifact (al->items);
1891 1874
1892 free (al); 1875 sfree (al);
1893 } 1876 }
1894} 1877}
1895 1878
1896void 1879void
1897free_all_treasures (void) 1880free_all_treasures (void)
1898{ 1881{
1899 treasurelist *tl, *next; 1882 treasurelist *tl, *next;
1900 1883
1901
1902 for (tl = first_treasurelist; tl != NULL; tl = next) 1884 for (tl = first_treasurelist; tl; tl = next)
1903 { 1885 {
1886 clear (tl);
1887
1904 next = tl->next; 1888 next = tl->next;
1905 if (tl->items)
1906 free_treasurestruct (tl->items);
1907 delete tl; 1889 delete tl;
1908 } 1890 }
1891
1909 free_artifactlist (first_artifactlist); 1892 free_artifactlist (first_artifactlist);
1910} 1893}

Diff Legend

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