| … | |
… | |
| 45 | typedef std::tr1::unordered_map< |
45 | typedef std::tr1::unordered_map< |
| 46 | const char *, |
46 | const char *, |
| 47 | treasurelist *, |
47 | treasurelist *, |
| 48 | str_hash, |
48 | str_hash, |
| 49 | str_equal, |
49 | str_equal, |
| 50 | slice_allocator< std::pair<const char *const, treasurelist *> >, |
50 | slice_allocator< std::pair<const char *const, treasurelist *> > |
| 51 | true |
|
|
| 52 | > tl_map_t; |
51 | > tl_map_t; |
| 53 | |
52 | |
| 54 | static tl_map_t tl_map; |
53 | static tl_map_t tl_map; |
| 55 | |
54 | |
| 56 | /* |
55 | /* |
| … | |
… | |
| 442 | |
441 | |
| 443 | if (ob->inv) |
442 | if (ob->inv) |
| 444 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
443 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
| 445 | |
444 | |
| 446 | ob->destroy (); |
445 | ob->destroy (); |
|
|
446 | |
| 447 | return tmp; |
447 | return tmp; |
| 448 | } |
448 | } |
| 449 | |
449 | |
| 450 | /* |
450 | /* |
| 451 | * This is a new way of calculating the chance for an item to have |
451 | * This is a new way of calculating the chance for an item to have |
| … | |
… | |
| 966 | case AMULET: |
966 | case AMULET: |
| 967 | if (IS_ARCH (op->arch, amulet)) |
967 | if (IS_ARCH (op->arch, amulet)) |
| 968 | op->value *= 5; /* Since it's not just decoration */ |
968 | op->value *= 5; /* Since it's not just decoration */ |
| 969 | |
969 | |
| 970 | case RING: |
970 | case RING: |
| 971 | if (!op->arch) // wtf? schmorp |
|
|
| 972 | { |
|
|
| 973 | op->destroy (); |
|
|
| 974 | op = 0; |
|
|
| 975 | break; |
|
|
| 976 | } |
|
|
| 977 | |
|
|
| 978 | if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */ |
971 | if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */ |
| 979 | break; |
972 | break; |
| 980 | |
973 | |
| 981 | if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) |
974 | if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) |
| 982 | SET_FLAG (op, FLAG_CURSED); |
975 | SET_FLAG (op, FLAG_CURSED); |
| … | |
… | |
| 1354 | * to cast. So convert that to into a spell and put it into |
1347 | * to cast. So convert that to into a spell and put it into |
| 1355 | * this object. |
1348 | * this object. |
| 1356 | */ |
1349 | */ |
| 1357 | if (op->type == HORN || op->type == POTION) |
1350 | if (op->type == HORN || op->type == POTION) |
| 1358 | { |
1351 | { |
| 1359 | object *tmp_obj; |
|
|
| 1360 | |
|
|
| 1361 | /* Remove any spells this object currently has in it */ |
1352 | /* Remove any spells this object currently has in it */ |
| 1362 | while (op->inv) |
|
|
| 1363 | op->inv->destroy (); |
1353 | op->destroy_inv (false); |
| 1364 | |
1354 | |
| 1365 | tmp_obj = arch_to_object (change->other_arch); |
1355 | object *tmp = arch_to_object (change->other_arch); |
| 1366 | insert_ob_in_ob (tmp_obj, op); |
1356 | insert_ob_in_ob (tmp, op); |
| 1367 | } |
1357 | } |
| 1368 | /* No harm setting this for potions/horns */ |
1358 | /* No harm setting this for potions/horns */ |
| 1369 | op->other_arch = change->other_arch; |
1359 | op->other_arch = change->other_arch; |
| 1370 | } |
1360 | } |
| 1371 | |
1361 | |
| … | |
… | |
| 1687 | free_artifact (artifact *at) |
1677 | free_artifact (artifact *at) |
| 1688 | { |
1678 | { |
| 1689 | if (at->next) free_artifact (at->next); |
1679 | if (at->next) free_artifact (at->next); |
| 1690 | if (at->allowed) free_charlinks (at->allowed); |
1680 | if (at->allowed) free_charlinks (at->allowed); |
| 1691 | |
1681 | |
| 1692 | at->item->destroy (1); |
1682 | at->item->destroy (); |
| 1693 | |
1683 | |
| 1694 | sfree (at); |
1684 | sfree (at); |
| 1695 | } |
1685 | } |
| 1696 | |
1686 | |
| 1697 | void |
1687 | void |
