--- deliantra/server/common/object.C	2007/04/21 16:56:29	1.138
+++ deliantra/server/common/object.C	2007/05/01 05:48:20	1.143
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
@@ -326,10 +326,11 @@
   long sum;
   object *inv;
 
-  for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
+  for (sum = 0, inv = op->inv; inv; inv = inv->below)
     {
       if (inv->inv)
         sum_weight (inv);
+
       sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
     }
 
@@ -837,15 +838,7 @@
     remove_button_link (this);
 
   if (flag [FLAG_FRIENDLY])
-    {
-      remove_friendly_object (this);
-
-      if (type == GOLEM
-          && owner
-          && owner->type == PLAYER
-          && owner->contr->ranges[range_golem] == this)
-        owner->contr->ranges[range_golem] = 0;
-    }
+    remove_friendly_object (this);
 
   if (!flag [FLAG_REMOVED])
     remove ();
@@ -1182,11 +1175,13 @@
 
   op->remove ();
 
+#if 0
   if (!m->active != !op->active)
     if (m->active)
       op->activate_recursive ();
     else
       op->deactivate_recursive ();
+#endif
 
   if (out_of_map (m, op->x, op->y))
     {
@@ -2591,15 +2586,10 @@
 const char *
 object::debug_desc () const
 {
-  static char info[256 * 4];
-  return debug_desc (info);
-}
+  static char info[3][256 * 4];
+  static int info_idx;
 
-const char *
-object::debug_desc2 () const
-{
-  static char info[256 * 4];
-  return debug_desc (info);
+  return debug_desc (info [++info_idx % 3]);
 }
 
 struct region *