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.78 by root, Sun Jul 20 16:56:34 2008 UTC vs.
Revision 1.83 by root, Sun Oct 5 14:16:13 2008 UTC

… …
45typedef std::tr1::unordered_map< 45typedef 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
54static tl_map_t tl_map; 53static 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
… …
1639 item->level = donor->level; 1629 item->level = donor->level;
1640 1630
1641 /* if donor has some attacktypes, the flesh is poisonous */ 1631 /* if donor has some attacktypes, the flesh is poisonous */
1642 if (donor->attacktype & AT_POISON) 1632 if (donor->attacktype & AT_POISON)
1643 item->type = POISON; 1633 item->type = POISON;
1634
1644 if (donor->attacktype & AT_ACID) 1635 if (donor->attacktype & AT_ACID)
1645 item->stats.hp = -1 * item->stats.food; 1636 item->stats.hp = -1 * item->stats.food;
1637
1646 SET_FLAG (item, FLAG_NO_STEAL); 1638 SET_FLAG (item, FLAG_NO_STEAL);
1647 } 1639 }
1648} 1640}
1649 1641
1650/* special_potion() - so that old potion code is still done right. */ 1642/* special_potion() - so that old potion code is still done right. */
… …
1687free_artifact (artifact *at) 1679free_artifact (artifact *at)
1688{ 1680{
1689 if (at->next) free_artifact (at->next); 1681 if (at->next) free_artifact (at->next);
1690 if (at->allowed) free_charlinks (at->allowed); 1682 if (at->allowed) free_charlinks (at->allowed);
1691 1683
1692 at->item->destroy (1); 1684 at->item->destroy ();
1693 1685
1694 sfree (at); 1686 sfree (at);
1695} 1687}
1696 1688
1697void 1689void

Diff Legend

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