--- deliantra/server/common/object.C	2007/04/21 16:56:29	1.138
+++ deliantra/server/common/object.C	2007/04/29 21:44:34	1.141
@@ -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
@@ -315,6 +315,12 @@
   return 1;
 }
 
+void
+player::set_range (rangetype r)
+{
+  shoottype = r;
+}
+
 /*
  * sum_weight() is a recursive function which calculates the weight
  * an object is carrying.  It goes through in figures out how much
@@ -837,15 +843,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 +1180,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))
     {