--- deliantra/server/common/map.C	2007/01/04 16:56:39	1.69
+++ deliantra/server/common/map.C	2007/01/04 20:29:45	1.70
@@ -733,10 +733,6 @@
 bool
 maptile::load_header (object_thawer &thawer)
 {
-  char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
-  int msgpos = 0;
-  int maplorepos = 0;
-
   for (;;)
     {
       keyword kw = thawer.get_kv ();
@@ -750,6 +746,11 @@
           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;
@@ -809,10 +810,6 @@
           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;
-
-          default:
-            LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
-            break;
         }
     }