--- cf.schmorp.de/server/random_maps/decor.C	2006/09/16 22:24:12	1.4
+++ cf.schmorp.de/server/random_maps/decor.C	2006/12/20 09:14:22	1.6
@@ -36,7 +36,7 @@
   int count = 0;
   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)
     count++;
   return count;
 }
@@ -79,7 +79,7 @@
 
                     new_decor_object = pick_random_object (decor_map);
                     this_object = arch_to_object (new_decor_object->arch);
-                    copy_object (new_decor_object, this_object);
+                    new_decor_object->copy_to (this_object);
                     this_object->x = x;
                     this_object->y = y;
                     /* it screws things up if decor can stop people */
@@ -105,7 +105,7 @@
 
                       new_decor_object = pick_random_object (decor_map);
                       this_object = arch_to_object (new_decor_object->arch);
-                      copy_object (new_decor_object, this_object);
+                      new_decor_object->copy_to (this_object);
                       this_object->x = i;
                       this_object->y = j;
                       /* it screws things up if decor can stop people */