| … | |
… | |
| 457 | create_treasure (t, ob, 0, difficulty, 0); |
457 | create_treasure (t, ob, 0, difficulty, 0); |
| 458 | |
458 | |
| 459 | /* Don't want to free the object we are about to return */ |
459 | /* Don't want to free the object we are about to return */ |
| 460 | tmp = ob->inv; |
460 | tmp = ob->inv; |
| 461 | if (tmp != NULL) |
461 | if (tmp != NULL) |
| 462 | remove_ob (tmp); |
462 | tmp->remove (); |
|
|
463 | |
| 463 | if (ob->inv) |
464 | if (ob->inv) |
| 464 | { |
|
|
| 465 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
465 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
| 466 | } |
466 | |
| 467 | free_object (ob); |
467 | ob->destroy (0); |
| 468 | return tmp; |
468 | return tmp; |
| 469 | } |
469 | } |
| 470 | |
470 | |
| 471 | /* |
471 | /* |
| 472 | * This is a new way of calculating the chance for an item to have |
472 | * This is a new way of calculating the chance for an item to have |
| … | |
… | |
| 849 | } |
849 | } |
| 850 | |
850 | |
| 851 | if (difficulty < 1) |
851 | if (difficulty < 1) |
| 852 | difficulty = 1; |
852 | difficulty = 1; |
| 853 | |
853 | |
|
|
854 | if (INVOKE_OBJECT (ADD_BONUS, op, |
|
|
855 | ARG_OBJECT (creator != op ? creator : 0), |
|
|
856 | ARG_INT (difficulty), ARG_INT (max_magic), |
|
|
857 | ARG_INT (flags))) |
|
|
858 | return; |
|
|
859 | |
| 854 | if (!(flags & GT_MINIMAL)) |
860 | if (!(flags & GT_MINIMAL)) |
| 855 | { |
861 | { |
| 856 | if (op->arch == crown_arch) |
862 | if (op->arch == crown_arch) |
| 857 | { |
863 | { |
| 858 | set_magic (difficulty, op, max_magic, flags); |
864 | set_magic (difficulty, op, max_magic, flags); |
| … | |
… | |
| 993 | op->value *= 5; /* Since it's not just decoration */ |
999 | op->value *= 5; /* Since it's not just decoration */ |
| 994 | |
1000 | |
| 995 | case RING: |
1001 | case RING: |
| 996 | if (op->arch == NULL) |
1002 | if (op->arch == NULL) |
| 997 | { |
1003 | { |
| 998 | remove_ob (op); |
1004 | op->remove (); |
| 999 | free_object (op); |
1005 | op->destroy (0); |
| 1000 | op = NULL; |
1006 | op = NULL; |
| 1001 | break; |
1007 | break; |
| 1002 | } |
1008 | } |
| 1003 | |
1009 | |
| 1004 | if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ |
1010 | if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ |
| … | |
… | |
| 1507 | |
1513 | |
| 1508 | /* Remove any spells this object currently has in it */ |
1514 | /* Remove any spells this object currently has in it */ |
| 1509 | while (op->inv) |
1515 | while (op->inv) |
| 1510 | { |
1516 | { |
| 1511 | tmp_obj = op->inv; |
1517 | tmp_obj = op->inv; |
| 1512 | remove_ob (tmp_obj); |
1518 | tmp_obj->remove (); |
| 1513 | free_object (tmp_obj); |
1519 | tmp_obj->destroy (0); |
| 1514 | } |
1520 | } |
| 1515 | |
1521 | |
| 1516 | tmp_obj = arch_to_object (change->other_arch); |
1522 | tmp_obj = arch_to_object (change->other_arch); |
| 1517 | insert_ob_in_ob (tmp_obj, op); |
1523 | insert_ob_in_ob (tmp_obj, op); |
| 1518 | } |
1524 | } |
| … | |
… | |
| 1556 | op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; |
1562 | op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; |
| 1557 | |
1563 | |
| 1558 | op->item_power = change->item_power; |
1564 | op->item_power = change->item_power; |
| 1559 | |
1565 | |
| 1560 | for (i = 0; i < NROFATTACKS; i++) |
1566 | for (i = 0; i < NROFATTACKS; i++) |
| 1561 | { |
|
|
| 1562 | if (change->resist[i]) |
1567 | if (change->resist[i]) |
| 1563 | { |
|
|
| 1564 | op->resist[i] += change->resist[i]; |
1568 | op->resist[i] += change->resist[i]; |
| 1565 | } |
|
|
| 1566 | } |
|
|
| 1567 | |
1569 | |
| 1568 | if (change->stats.dam) |
1570 | if (change->stats.dam) |
| 1569 | { |
1571 | { |
| 1570 | if (change->stats.dam < 0) |
1572 | if (change->stats.dam < 0) |
| 1571 | op->stats.dam = (-change->stats.dam); |
1573 | op->stats.dam = (-change->stats.dam); |
| … | |
… | |
| 1849 | free_artifact (at->next); |
1851 | free_artifact (at->next); |
| 1850 | |
1852 | |
| 1851 | if (at->allowed) |
1853 | if (at->allowed) |
| 1852 | free_charlinks (at->allowed); |
1854 | free_charlinks (at->allowed); |
| 1853 | |
1855 | |
| 1854 | at->item->free (1); |
1856 | at->item->destroy (1); |
| 1855 | |
1857 | |
| 1856 | delete at; |
1858 | delete at; |
| 1857 | } |
1859 | } |
| 1858 | |
1860 | |
| 1859 | void |
1861 | void |
| 1860 | free_artifactlist (artifactlist * al) |
1862 | free_artifactlist (artifactlist * al) |
| 1861 | { |
1863 | { |
| 1862 | artifactlist *nextal; |
1864 | artifactlist *nextal; |
| 1863 | |
1865 | |
| 1864 | for (al = first_artifactlist; al != NULL; al = nextal) |
1866 | for (al = first_artifactlist; al; al = nextal) |
| 1865 | { |
1867 | { |
| 1866 | nextal = al->next; |
1868 | nextal = al->next; |
| 1867 | |
1869 | |
| 1868 | if (al->items) |
1870 | if (al->items) |
| 1869 | free_artifact (al->items); |
1871 | free_artifact (al->items); |
