--- deliantra/server/common/object.C	2007/06/05 13:05:02	1.160
+++ deliantra/server/common/object.C	2007/06/16 00:12:20	1.162
@@ -939,18 +939,19 @@
     y = 1;
   }
 
-  head = 0;
-
   if (more)
     {
       more->destroy ();
       more = 0;
     }
 
-  // clear those pointers that likely might have circular references to us
-  owner       = 0;
-  enemy       = 0;
-  attacked_by = 0;
+  head = 0;
+
+  // clear those pointers that likely might cause circular references
+  owner          = 0;
+  enemy          = 0;
+  attacked_by    = 0;
+  current_weapon = 0;
 }
 
 void
@@ -1118,11 +1119,6 @@
                 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
             }
 
-          /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
-          //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
-          if (tmp->above == tmp)
-            tmp->above = 0;
-
           last = tmp;
         }
 
@@ -2576,7 +2572,6 @@
     item = item->env;
 }
 
-
 const char *
 object::flag_desc (char *desc, int len) const
 {