--- deliantra/server/common/map.C	2007/01/20 22:09:51	1.79
+++ deliantra/server/common/map.C	2007/02/01 19:15:38	1.83
@@ -741,18 +741,6 @@
 
       switch (kw)
         {
-          case KW_EOF:
-            LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
-            return false;
-
-          case KW_end:
-            return true;
-
-          default:
-          case KW_ERROR:
-            LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
-            break;
-
           case KW_msg:
             thawer.get_ml (KW_endmsg, msg);
             break;
@@ -794,7 +782,7 @@
           case KW_per_player: thawer.get (per_player); break;
           case KW_per_party:  thawer.get (per_party);  break;
                               
-          case KW_region:     get_region_by_name (thawer.get_str ()); break;
+          case KW_region:     default_region = region::find (thawer.get_str ()); break;
           case KW_shopitems:  shopitems = parse_shop_string (thawer.get_str ()); break;
 
           //   old names            new names
@@ -812,6 +800,14 @@
           case KW_tile_path_2: thawer.get (tile_path [1]); break;
           case KW_tile_path_3: thawer.get (tile_path [2]); break;
           case KW_tile_path_4: thawer.get (tile_path [3]); break;
+
+          case KW_end:
+            return true;
+
+          default:
+            if (!thawer.parse_error (kw, "map", 0))
+              return false;
+            break;
         }
     }
 
@@ -873,7 +869,7 @@
   MAP_OUT (fixed_resettime);
   MAP_OUT (difficulty);
 
-  if (region) MAP_OUT2 (region, region->name);
+  if (default_region) MAP_OUT2 (region, default_region->name);
 
   if (shopitems)
     {
@@ -934,20 +930,23 @@
 void
 maptile::clear ()
 {
-  if (!spaces)
-    return;
+  sfree (regions, size ()), regions = 0;
+  free (regionmap), regionmap = 0;
 
-  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-    while (object *op = ms->bot)
-      {
-        if (op->head)
-          op = op->head;
+  if (spaces)
+    {
+      for (mapspace *ms = spaces + size (); ms-- > spaces; )
+        while (object *op = ms->bot)
+          {
+            if (op->head)
+              op = op->head;
 
-        op->destroy_inv (false);
-        op->destroy ();
-      }
+            op->destroy_inv (false);
+            op->destroy ();
+          }
 
-  sfree (spaces, size ()), spaces = 0;
+      sfree (spaces, size ()), spaces = 0;
+    }
 
   if (buttons)
     free_objectlinkpt (buttons), buttons = 0;
@@ -1451,7 +1450,7 @@
  * Return whether map2 is adjacent to map1. If so, store the distance from
  * map1 to map2 in dx/dy.
  */
-static int
+int
 adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
 {
   if (!map1 || !map2)
@@ -1633,9 +1632,8 @@
  * for something in the future.  Also, since no object is pasted, the best
  * field of the rv_vector is set to NULL.
  */
-
 void
-get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)
+get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
 {
   if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
     {
@@ -1682,3 +1680,18 @@
   return insert_ob_in_map_at (op, this, originator, flags, x, y);
 }
 
+region *
+maptile::region (int x, int y) const
+{
+  if (regions
+      && regionmap
+      && !OUT_OF_REAL_MAP (this, x, y))
+    if (struct region *reg = regionmap [regions [y * width + x]])
+      return reg;
+
+  if (default_region)
+    return default_region;
+
+  return ::region::default_region ();
+}
+