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.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.256 by root, Sun Aug 31 05:47:14 2008 UTC

636 } 636 }
637 637
638 if (speed < 0) 638 if (speed < 0)
639 dst->speed_left -= rndm (); 639 dst->speed_left -= rndm ();
640 640
641 dst->set_speed (dst->speed); 641 dst->activate ();
642} 642}
643 643
644void 644void
645object::instantiate () 645object::instantiate ()
646{ 646{
829object::activate () 829object::activate ()
830{ 830{
831 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
832 if (active) 832 if (active)
833 return; 833 return;
834
835 if (has_active_speed () && flag [FLAG_FREED ]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
834 836
835 if (has_active_speed ()) 837 if (has_active_speed ())
836 actives.insert (this); 838 actives.insert (this);
837} 839}
838 840

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines