--- deliantra/server/common/button.C	2006/10/15 02:16:34	1.12
+++ deliantra/server/common/button.C	2006/12/13 03:28:42	1.14
@@ -773,10 +773,8 @@
              * dereference a null value
              */
             if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp)
-              {
-                tmp->owner->contr->ranges[range_golem] = NULL;
-                tmp->owner->contr->golem_count = 0;
-              }
+              tmp->owner->contr->ranges[range_golem] = 0;
+
             tmp->owner = 0;
           }
         break;
@@ -803,7 +801,7 @@
 
         if (tmp2->type != PLAYER)
           break;
-        set_owner (tmp, tmp2);
+        tmp->set_owner (tmp2);
         SET_FLAG (tmp, FLAG_MONSTER);
         tmp->stats.exp = 0;
         SET_FLAG (tmp, FLAG_FRIENDLY);