--- deliantra/server/common/object.C	2007/04/21 17:34:22	1.139
+++ deliantra/server/common/object.C	2007/04/30 04:25:29	1.142
@@ -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 ();