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.74 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.80 by root, Mon Sep 29 09:04:51 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/*
… …
249 * by another object. 248 * by another object.
250 */ 249 */
251 //TODO: flag such as objects... as such (no drop, anybody?) 250 //TODO: flag such as objects... as such (no drop, anybody?)
252 if (op->type == SPELL) 251 if (op->type == SPELL)
253 { 252 {
254 op->destroy (); 253 op->destroy (true);
255 return; 254 return;
256 } 255 }
257 256
258 op->expand_tail (); 257 op->expand_tail ();
259 258
260 if (op->blocked (creator->map, creator->x, creator->y)) 259 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
261 op->destroy (); 260 op->destroy (true);
262 else 261 else
263 { 262 {
264 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 263 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
265 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 264 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
266 } 265 }
… …
269 { 268 {
270 op = creator->insert (op); 269 op = creator->insert (op);
271 270
272 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 271 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
273 monster_check_apply (creator, op); 272 monster_check_apply (creator, op);
274
275 if (flags & GT_UPDATE_INV)
276 if (object *tmp = creator->in_player ())
277 esrv_send_item (tmp, op);
278 } 273 }
279} 274}
280 275
281/* if there are change_xxx commands in the treasure, we include the changes 276/* if there are change_xxx commands in the treasure, we include the changes
282 * in the generated object 277 * in the generated object
… …
445 tmp->remove (); 440 tmp->remove ();
446 441
447 if (ob->inv) 442 if (ob->inv)
448 LOG (llevError, "In generate treasure, created multiple objects.\n"); 443 LOG (llevError, "In generate treasure, created multiple objects.\n");
449 444
450 ob->destroy (); 445 ob->destroy (true);
446
451 return tmp; 447 return tmp;
452} 448}
453 449
454/* 450/*
455 * 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
… …
582 if (op->type == ARMOUR) 578 if (op->type == ARMOUR)
583 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; 579 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
584 580
585 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 581 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
586 magic = (-magic); 582 magic = (-magic);
583
587 op->weight = (op->arch->weight * (100 - magic * 10)) / 100; 584 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
588 } 585 }
589 else 586 else
590 { 587 {
591 if (op->type == ARMOUR) 588 if (op->type == ARMOUR)
592 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 589 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
590
593 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 591 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
594 magic = (-magic); 592 magic = (-magic);
593
595 op->weight = (op->weight * (100 - magic * 10)) / 100; 594 op->weight = (op->weight * (100 - magic * 10)) / 100;
596 } 595 }
597} 596}
598 597
599/* 598/*
… …
967 case AMULET: 966 case AMULET:
968 if (IS_ARCH (op->arch, amulet)) 967 if (IS_ARCH (op->arch, amulet))
969 op->value *= 5; /* Since it's not just decoration */ 968 op->value *= 5; /* Since it's not just decoration */
970 969
971 case RING: 970 case RING:
972 if (!op->arch) // wtf? schmorp
973 {
974 op->destroy ();
975 op = 0;
976 break;
977 }
978
979 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! */
980 break; 972 break;
981 973
982 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 974 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
983 SET_FLAG (op, FLAG_CURSED); 975 SET_FLAG (op, FLAG_CURSED);
… …
1355 * 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
1356 * this object. 1348 * this object.
1357 */ 1349 */
1358 if (op->type == HORN || op->type == POTION) 1350 if (op->type == HORN || op->type == POTION)
1359 { 1351 {
1360 object *tmp_obj;
1361
1362 /* Remove any spells this object currently has in it */ 1352 /* Remove any spells this object currently has in it */
1363 while (op->inv)
1364 op->inv->destroy (); 1353 op->destroy_inv ();
1365 1354
1366 tmp_obj = arch_to_object (change->other_arch); 1355 object *tmp = arch_to_object (change->other_arch);
1367 insert_ob_in_ob (tmp_obj, op); 1356 insert_ob_in_ob (tmp, op);
1368 } 1357 }
1369 /* No harm setting this for potions/horns */ 1358 /* No harm setting this for potions/horns */
1370 op->other_arch = change->other_arch; 1359 op->other_arch = change->other_arch;
1371 } 1360 }
1372 1361
… …
1688free_artifact (artifact *at) 1677free_artifact (artifact *at)
1689{ 1678{
1690 if (at->next) free_artifact (at->next); 1679 if (at->next) free_artifact (at->next);
1691 if (at->allowed) free_charlinks (at->allowed); 1680 if (at->allowed) free_charlinks (at->allowed);
1692 1681
1693 at->item->destroy (1); 1682 at->item->destroy (true);
1694 1683
1695 sfree (at); 1684 sfree (at);
1696} 1685}
1697 1686
1698void 1687void

Diff Legend

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