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.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

677 677
678void object::link () 678void object::link ()
679{ 679{
680 uuid = gen_uuid (); 680 uuid = gen_uuid ();
681 681
682 refcnt_inc ();
682 objects.insert (this); 683 objects.insert (this);
683} 684}
684 685
685void object::unlink () 686void object::unlink ()
686{ 687{
687 objects.erase (this); 688 objects.erase (this);
689 refcnt_dec ();
688} 690}
689 691
690void 692void
691object::activate () 693object::activate ()
692{ 694{
782 784
783 if (op->flag [FLAG_STARTEQUIP] 785 if (op->flag [FLAG_STARTEQUIP]
784 || op->flag [FLAG_NO_DROP] 786 || op->flag [FLAG_NO_DROP]
785 || op->type == RUNE 787 || op->type == RUNE
786 || op->type == TRAP 788 || op->type == TRAP
787 || op->flag [FLAG_IS_A_TEMPLATE]) 789 || op->flag [FLAG_IS_A_TEMPLATE]
790 || op->flag [FLAG_DESTROY_ON_DEATH])
788 op->destroy (); 791 op->destroy ();
789 else 792 else
790 map->insert (op, x, y); 793 map->insert (op, x, y);
791 } 794 }
792 } 795 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines