--- deliantra/server/common/friend.C	2007/04/24 12:32:14	1.11
+++ deliantra/server/common/friend.C	2007/05/17 21:32:08	1.13
@@ -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) 2002 Mark Wedel & Crossfire Development Team
@@ -68,11 +68,8 @@
   if (op->type == GOLEM
       && op->owner
       && op->owner->contr
-      && op->owner->contr->ranges[range_golem] == op)
-    {
-      op->owner->contr->ranges[range_golem] = 0;
-      op->owner->contr->shoottype = range_none;
-    }
+      && op->owner->contr->golem == op)
+    op->owner->contr->golem = 0;
 
   if (!first_friendly_object)
     {