Comparing deliantra/server/common/object.C (file contents):
Revision 1.120 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.121 by root, Tue Jan 23 03:17:55 2007 UTC
… | |
… | |
670 | face = blank_face; |
670 | face = blank_face; |
671 | } |
671 | } |
672 | |
672 | |
673 | object::~object () |
673 | object::~object () |
674 | { |
674 | { |
675 | if (index) |
|
|
676 | unlink (); |
675 | unlink (); |
677 | |
676 | |
678 | free_key_values (this); |
677 | free_key_values (this); |
679 | } |
678 | } |
680 | |
679 | |
681 | static int object_count; |
680 | static int object_count; |
… | |
… | |
690 | objects.insert (this); |
689 | objects.insert (this); |
691 | } |
690 | } |
692 | |
691 | |
693 | void object::unlink () |
692 | void object::unlink () |
694 | { |
693 | { |
695 | assert (index);//D |
694 | if (!index) |
|
|
695 | return; |
|
|
696 | |
696 | objects.erase (this); |
697 | objects.erase (this); |
697 | refcnt_dec (); |
698 | refcnt_dec (); |
698 | } |
699 | } |
699 | |
700 | |
700 | void |
701 | void |
Diff Legend
– |
Removed lines |
+ |
Added lines |
< |
Changed lines |
> |
Changed lines |