--- deliantra/server/common/object.C	2007/08/20 18:11:02	1.182
+++ deliantra/server/common/object.C	2007/08/24 01:23:29	1.185
@@ -376,7 +376,6 @@
  * multi-object 1 which is closest to the second object.
  * If it's not a multi-object, it is returned.
  */
-
 object *
 get_nearest_part (object *op, const object *pl)
 {
@@ -431,22 +430,15 @@
 /*
  * Sets the owner and sets the skill and exp pointers to owner's current
  * skill and experience objects.
+ * ACTUALLY NO! investigate! TODO
  */
 void
 object::set_owner (object *owner)
 {
-  if (!owner)
-    return;
-
-  /* next line added to allow objects which own objects */
-  /* Add a check for ownercounts in here, as I got into an endless loop
-   * with the fireball owning a poison cloud which then owned the
-   * fireball.  I believe that was caused by one of the objects getting
-   * freed and then another object replacing it.  Since the ownercounts
-   * didn't match, this check is valid and I believe that cause is valid.
-   */
-  while (owner->owner)
-    owner = owner->owner;
+  // allow objects which own objects
+  if (owner)
+    while (owner->owner)
+      owner = owner->owner;
 
   this->owner = owner;
 }
@@ -588,7 +580,7 @@
   *dst = *this;
 
   if (speed < 0)
-    dst->speed_left = speed_left - rndm ();
+    dst->speed_left -= rndm ();
 
   dst->set_speed (dst->speed);
 }