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.318 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC

572 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); 572 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573 return; 573 return;
574 } 574 }
575 575
576 this->owner = owner; 576 this->owner = owner;
577}
578
579int
580object::slottype () const
581{
582 if (type == SKILL)
583 {
584 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
585 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
586 }
587 else
588 {
589 if (slot [body_combat].info) return slot_combat;
590 if (slot [body_range ].info) return slot_ranged;
591 }
592
593 return slot_none;
594} 577}
595 578
596/* Zero the key_values on op, decrementing the shared-string 579/* Zero the key_values on op, decrementing the shared-string
597 * refcounts and freeing the links. 580 * refcounts and freeing the links.
598 */ 581 */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines