ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC

… …
374/* 374/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
378 */ 378 */
379
380object * 379object *
381get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
382{ 381{
383 object *tmp, *closest; 382 object *tmp, *closest;
384 int last_dist, i; 383 int last_dist, i;
… …
429} 428}
430 429
431/* 430/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 431 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
434 */ 434 */
435void 435void
436object::set_owner (object *owner) 436object::set_owner (object *owner)
437{ 437{
438 // allow objects which own objects
438 if (!owner) 439 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 440 while (owner->owner)
449 owner = owner->owner; 441 owner = owner->owner;
450 442
451 this->owner = owner; 443 this->owner = owner;
452} 444}
453 445
454int 446int
… …
586object::copy_to (object *dst) 578object::copy_to (object *dst)
587{ 579{
588 *dst = *this; 580 *dst = *this;
589 581
590 if (speed < 0) 582 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 583 dst->speed_left -= rndm ();
592 584
593 dst->set_speed (dst->speed); 585 dst->set_speed (dst->speed);
594} 586}
595 587
596void 588void
… …
1413 op->map->touch (); 1405 op->map->touch ();
1414 } 1406 }
1415 1407
1416 op->map->dirty = true; 1408 op->map->dirty = true;
1417 1409
1418 /* If we have a floor, we know the player, if any, will be above
1419 * it, so save a few ticks and start from there.
1420 */
1421 if (!(flag & INS_MAP_LOAD)) 1410 if (!(flag & INS_MAP_LOAD))
1422 if (object *pl = ms.player ()) 1411 if (object *pl = ms.player ())
1423 pl->contr->ns->floorbox_update (); 1412 pl->contr->ns->floorbox_update ();
1424 1413
1425 /* If this object glows, it may affect lighting conditions that are 1414 /* If this object glows, it may affect lighting conditions that are
… …
1666 * be != op, if items are merged. -Tero 1655 * be != op, if items are merged. -Tero
1667 */ 1656 */
1668object * 1657object *
1669object::insert (object *op) 1658object::insert (object *op)
1670{ 1659{
1671 object *tmp, *otmp;
1672
1673 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1660 if (!QUERY_FLAG (op, FLAG_REMOVED))
1674 op->remove (); 1661 op->remove ();
1675 1662
1676 if (op->more) 1663 if (op->more)
1677 { 1664 {
… …
1679 return op; 1666 return op;
1680 } 1667 }
1681 1668
1682 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1669 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1683 CLEAR_FLAG (op, FLAG_REMOVED); 1670 CLEAR_FLAG (op, FLAG_REMOVED);
1671
1684 if (op->nrof) 1672 if (op->nrof)
1685 { 1673 {
1686 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1674 for (object *tmp = inv; tmp; tmp = tmp->below)
1687 if (object::can_merge (tmp, op)) 1675 if (object::can_merge (tmp, op))
1688 { 1676 {
1689 /* return the original object and remove inserted object 1677 /* return the original object and remove inserted object
1690 (client needs the original object) */ 1678 (client needs the original object) */
1691 tmp->nrof += op->nrof; 1679 tmp->nrof += op->nrof;
… …
1710 add_weight (this, op->weight * op->nrof); 1698 add_weight (this, op->weight * op->nrof);
1711 } 1699 }
1712 else 1700 else
1713 add_weight (this, (op->weight + op->carrying)); 1701 add_weight (this, (op->weight + op->carrying));
1714 1702
1715 otmp = this->in_player (); 1703 if (object *otmp = this->in_player ())
1716 if (otmp && otmp->contr)
1717 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1704 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1718 otmp->update_stats (); 1705 otmp->update_stats ();
1719 1706
1707 op->owner = 0; // its his/hers now. period.
1720 op->map = 0; 1708 op->map = 0;
1721 op->env = this; 1709 op->env = this;
1722 op->above = 0; 1710 op->above = 0;
1723 op->below = 0; 1711 op->below = 0;
1724 op->x = 0, op->y = 0; 1712 op->x = op->y = 0;
1725 1713
1726 /* reset the light list and los of the players on the map */ 1714 /* reset the light list and los of the players on the map */
1727 if ((op->glow_radius != 0) && map) 1715 if (op->glow_radius && map)
1728 { 1716 {
1729#ifdef DEBUG_LIGHTS 1717#ifdef DEBUG_LIGHTS
1730 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1718 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1731#endif /* DEBUG_LIGHTS */ 1719#endif /* DEBUG_LIGHTS */
1732 if (map->darkness) 1720 if (map->darkness)
… …
2603 &name, 2591 &name,
2604 title ? "\",title:\"" : "", 2592 title ? "\",title:\"" : "",
2605 title ? (const char *)title : "", 2593 title ? (const char *)title : "",
2606 flag_desc (flagdesc, 512), type); 2594 flag_desc (flagdesc, 512), type);
2607 2595
2608 if (env) 2596 if (!this->flag[FLAG_REMOVED] && env)
2609 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2597 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2610 2598
2611 if (map) 2599 if (map)
2612 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2600 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2613 2601

Diff Legend

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