--- deliantra/server/random_maps/standalone.C	2006/12/18 03:00:02	1.8
+++ deliantra/server/random_maps/standalone.C	2006/12/30 18:45:28	1.11
@@ -38,7 +38,7 @@
 {
   char InFileName[1024], OutFileName[1024];
   maptile *newMap;
-  RMParms rp;
+  random_map_params rp;
   FILE *fp;
 
   if (argc < 3)
@@ -57,7 +57,7 @@
   init_readable ();
 
   init_gods ();
-  memset (&rp, 0, sizeof (RMParms));
+  memset (&rp, 0, sizeof (random_map_params));
   rp.Xsize = -1;
   rp.Ysize = -1;
   if ((fp = fopen (InFileName, "r")) == NULL)
@@ -139,9 +139,9 @@
   object *tmp, *above = NULL;
   int x, y;
 
-  for (x = 0; x < MAP_WIDTH (m); x++)
-    for (y = 0; y < MAP_HEIGHT (m); y++)
-      for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
+  for (x = 0; x < m->width; x++)
+    for (y = 0; y < m->height; y++)
+      for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
         {
           above = tmp->above;
 
@@ -165,9 +165,9 @@
                 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0);
             }
         }
-  for (x = 0; x < MAP_WIDTH (m); x++)
-    for (y = 0; y < MAP_HEIGHT (m); y++)
-      for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
+  for (x = 0; x < m->width; x++)
+    for (y = 0; y < m->height; y++)
+      for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
         if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
           check_trigger (tmp, tmp->above);
 }