[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.305 by root, Wed Nov 11 04:45:22 2009 UTC vs.
Revision 1.306 by root, Sun Nov 29 09:41:27 2009 UTC

               tail = new_link;
             }
         }
     }
-  if (speed < 0)
-    dst->speed_left -= rndm ();
   dst->activate ();
 }
 void
 object::instantiate ()
 {
   if (!uuid.seq) // HACK
     uuid = UUID::gen ();
+  // TODO: unclean state changes, should nt be done in copy_to AND instantiate
+  if (flag [FLAG_RANDOM_SPEED] && speed)
+    speed_left = -rndm (); // TODO animation
+  else
-  speed_left = -0.1f;
+    speed_left = -speed;
   /* copy the body_info to the body_used - this is only really
    * need for monsters, but doesn't hurt to do it for everything.
    * by doing so, when a monster is created, it has good starting
    * values for the body_used info, so when items are created
    * for it, they can be properly equipped.
 object *
 object::clone ()
 {
   object *neu = create ();
   copy_to (neu);
+  // TODO: unclean state changes, should not be done in clone AND instantiate
+  if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
+    neu->speed_left = -rndm (); // TODO animation
   neu->map = map; // not copied by copy_to
   return neu;
 }
 /*

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