| … | |
… | |
| 197 | |
197 | |
| 198 | /* 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. |
| 199 | * 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 |
| 200 | * fields of the treasures are not being used. |
200 | * fields of the treasures are not being used. |
| 201 | */ |
201 | */ |
| 202 | tl->total_chance = 0; |
|
|
| 203 | |
|
|
| 204 | if (one) |
202 | if (one) |
| 205 | { |
203 | { |
| 206 | for (treasure *t = tl->items; t; t = t->next) |
204 | for (treasure *t = tl->items; t; t = t->next) |
| 207 | { |
205 | { |
| 208 | if (t->next_yes || t->next_no) |
206 | if (t->next_yes || t->next_no) |
| … | |
… | |
| 230 | * start with equipment, but only their abilities). |
228 | * start with equipment, but only their abilities). |
| 231 | */ |
229 | */ |
| 232 | static void |
230 | static void |
| 233 | put_treasure (object *op, object *creator, int flags) |
231 | put_treasure (object *op, object *creator, int flags) |
| 234 | { |
232 | { |
|
|
233 | if (flags & GT_ENVIRONMENT) |
|
|
234 | { |
| 235 | /* 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 |
| 236 | * 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 |
| 237 | * 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 |
| 238 | * by another object. |
238 | * by another object. |
| 239 | */ |
239 | */ |
| 240 | if (flags & GT_ENVIRONMENT && op->type != SPELL) |
240 | //TODO: flag such as objects... as such (no drop, anybody?) |
| 241 | { |
241 | if (op->type == SPELL) |
|
|
242 | { |
|
|
243 | op->destroy (); |
|
|
244 | return; |
|
|
245 | } |
|
|
246 | |
| 242 | op->expand_tail (); |
247 | op->expand_tail (); |
| 243 | |
248 | |
| 244 | if (ob_blocked (op, creator->map, creator->x, creator->y)) |
249 | if (ob_blocked (op, creator->map, creator->x, creator->y)) |
| 245 | op->destroy (); |
250 | op->destroy (); |
| 246 | else |
251 | else |
| … | |
… | |
| 364 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
369 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
| 365 | change_treasure (t, tmp); |
370 | change_treasure (t, tmp); |
| 366 | put_treasure (tmp, op, flag); |
371 | put_treasure (tmp, op, flag); |
| 367 | } |
372 | } |
| 368 | } |
373 | } |
|
|
374 | } |
|
|
375 | |
|
|
376 | void |
|
|
377 | object::create_treasure (treasurelist *tl, int flags) |
|
|
378 | { |
|
|
379 | ::create_treasure (tl, this, flags, map ? map->difficulty : 0); |
| 369 | } |
380 | } |
| 370 | |
381 | |
| 371 | /* This calls the appropriate treasure creation function. tries is passed |
382 | /* This calls the appropriate treasure creation function. tries is passed |
| 372 | * to determine how many list transitions or attempts to create treasure |
383 | * to determine how many list transitions or attempts to create treasure |
| 373 | * 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 |
| … | |
… | |
| 385 | if (tries++ > 100) |
396 | if (tries++ > 100) |
| 386 | { |
397 | { |
| 387 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
398 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
| 388 | return; |
399 | return; |
| 389 | } |
400 | } |
|
|
401 | |
|
|
402 | if (op->flag [FLAG_TREASURE_ENV]) |
|
|
403 | flag |= GT_ENVIRONMENT; |
| 390 | |
404 | |
| 391 | if (tl->total_chance) |
405 | if (tl->total_chance) |
| 392 | create_one_treasure (tl, op, flag, difficulty, tries); |
406 | create_one_treasure (tl, op, flag, difficulty, tries); |
| 393 | else |
407 | else |
| 394 | create_all_treasures (tl->items, op, flag, difficulty, tries); |
408 | create_all_treasures (tl->items, op, flag, difficulty, tries); |
