--- deliantra/server/common/map.C	2007/01/27 23:59:29	1.81
+++ 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;
@@ -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;
         }
     }
 
@@ -1454,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)
@@ -1636,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))
     {