--- deliantra/server/random_maps/standalone.C	2006/09/14 22:34:02	1.4
+++ deliantra/server/random_maps/standalone.C	2006/12/18 03:00:02	1.8
@@ -37,7 +37,7 @@
 main (int argc, char *argv[])
 {
   char InFileName[1024], OutFileName[1024];
-  mapstruct *newMap;
+  maptile *newMap;
   RMParms rp;
   FILE *fp;
 
@@ -73,7 +73,7 @@
 }
 
 void
-set_map_timeout (mapstruct *)
+set_map_timeout (maptile *)
 {
 }                               /* doesn't need to do anything */
 
@@ -91,7 +91,7 @@
   switch (op->type)
     {
         case SHOP_FLOOR:
-          if (!HAS_RANDOM_ITEMS (op))
+          if (!op->has_random_items ())
             return 0;
           do
             {
@@ -101,7 +101,7 @@
                 return 0;
               if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
                 {
-                  free_object (tmp);
+                  tmp->destroy ();
                   tmp = NULL;
                 }
             }
@@ -115,12 +115,12 @@
           break;
 
         case TREASURE:
-          if (HAS_RANDOM_ITEMS (op))
+          if (op->has_random_items ())
             while ((op->stats.hp--) > 0)
               create_treasure (op->randomitems, op, GT_ENVIRONMENT,
                                op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
-          remove_ob (op);
-          free_object (op);
+          op->remove ();
+          op->destroy ();
           break;
     }
 
@@ -134,7 +134,7 @@
  */
 
 void
-fix_auto_apply (mapstruct *m)
+fix_auto_apply (maptile *m)
 {
   object *tmp, *above = NULL;
   int x, y;
@@ -149,7 +149,7 @@
             auto_apply (tmp);
           else if (tmp->type == TREASURE)
             {
-              if (HAS_RANDOM_ITEMS (tmp))
+              if (tmp->has_random_items ())
                 while ((tmp->stats.hp--) > 0)
                   create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
             }
@@ -157,11 +157,11 @@
             {
               if (tmp->type == CONTAINER)
                 {
-                  if (HAS_RANDOM_ITEMS (tmp))
+                  if (tmp->has_random_items ())
                     while ((tmp->stats.hp--) > 0)
                       create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
                 }
-              else if (HAS_RANDOM_ITEMS (tmp))
+              else if (tmp->has_random_items ())
                 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0);
             }
         }
@@ -185,7 +185,7 @@
 }
 
 void
-new_info_map (int color, mapstruct *map, const char *str)
+new_info_map (int color, maptile *map, const char *str)
 {
   fprintf (logfile, "new_info_map: %s\n", str);
 }
@@ -241,7 +241,7 @@
 }
 
 void
-set_darkness_map (mapstruct *m)
+set_darkness_map (maptile *m)
 {
 }