--- deliantra/server/random_maps/treasure.C	2006/12/12 20:53:03	1.8
+++ deliantra/server/random_maps/treasure.C	2006/12/20 09:14:22	1.10
@@ -211,7 +211,7 @@
   i = find_first_free_spot (the_chest, map, x, y);
   if (i == -1)
     {
-      the_chest->destroy (0);
+      the_chest->destroy ();
       return NULL;
     }
   xl = x + freearr_x[i];
@@ -267,7 +267,7 @@
               object *new_trap;
 
               new_trap = arch_to_object (the_trap->arch);
-              copy_object (new_trap, the_trap);
+              new_trap->copy_to (the_trap);
               new_trap->x = x;
               new_trap->y = y;
               insert_ob_in_ob (new_trap, the_chest);
@@ -314,7 +314,7 @@
         /* don't bother searching this square unless the map says life exists. */
         if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE)
           {
-            object *the_monster = get_map_ob (map, lx, ly);
+            object *the_monster = GET_MAP_OB (map, lx, ly);
 
             for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_MONSTER)); the_monster = the_monster->above);
             if (the_monster && QUERY_FLAG (the_monster, FLAG_MONSTER))
@@ -455,7 +455,7 @@
   layout[x][y] = 1;
   if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE)
     {
-      object *the_monster = get_map_ob (map, x, y);
+      object *the_monster = GET_MAP_OB (map, x, y);
 
       /* check off this point */
       for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_ALIVE)); the_monster = the_monster->above);
@@ -675,14 +675,14 @@
 {
   object *tmp;
 
-  for (tmp = get_map_ob (map, x, y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)
     if (QUERY_FLAG (tmp, FLAG_ALIVE))
       {
         if (tmp->head)
           tmp = tmp->head;
         tmp->remove ();
-        tmp->destroy (0);
-        tmp = get_map_ob (map, x, y);
+        tmp->destroy ();
+        tmp = GET_MAP_OB (map, x, y);
         if (tmp == NULL)
           break;
       };
@@ -741,7 +741,7 @@
 {
   object *tmp;
 
-  for (tmp = get_map_ob (map, x, y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)
     if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
       return tmp;
   return NULL;
@@ -851,7 +851,7 @@
           new_door->x = door->x;
           new_door->y = door->y;
           door->remove ();
-          door->destroy (0);
+          door->destroy ();
           doorlist[i] = new_door;
           insert_ob_in_map (new_door, map, NULL, 0);
           sprintf (keybuf, "%d", (int) RANDOM ());
@@ -878,7 +878,7 @@
               door->face = wallface->face;
               if (!QUERY_FLAG (wallface, FLAG_REMOVED))
                 wallface->remove ();
-              wallface->destroy (0);
+              wallface->destroy ();
             }
         }
     }