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.285 by root, Tue Sep 1 20:56:05 2009 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC

… …
831{ 831{
832 /* If already on active list, don't do anything */ 832 /* If already on active list, don't do anything */
833 if (active) 833 if (active)
834 return; 834 return;
835 835
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 836 if (has_active_speed ())
837 {
838 if (flag [FLAG_FREED])
839 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
840
840 actives.insert (this); 841 actives.insert (this);
842 }
841} 843}
842 844
843void 845void
844object::activate_recursive () 846object::activate_recursive ()
845{ 847{

Diff Legend

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