save/load fixes

[d2df-sdl.git] / src / tools / mapgen.dpr

diff --git a/src/tools/mapgen.dpr b/src/tools/mapgen.dpr
index 1a4850593b81dcf21d215761a613be7e971bc713..28b035c12981d590ae9593fbbb253d92797c34a5 100644 (file)
--- a/src/tools/mapgen.dpr
+++ b/src/tools/mapgen.dpr
@@ -265,14 +265,21 @@ begin
     writeln('FATAL: mapdef not found!');
   end;
 
+  writeln('parsing "mapdef.txt"...');
   pr := TFileTextParser.Create(st, false); // don't own
   try
     dfmapdef := TDynMapDef.Create(pr);
-  except on e: Exception do
-    begin
-      writeln('ERROR at (', pr.tokLine, ',', pr.tokCol, '): ', e.message);
-      Halt(1);
-    end;
+  except
+    on e: TDynParseException do
+      begin
+        writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
+        Halt(1);
+      end;
+    on e: Exception do
+      begin
+        writeln('ERROR: ', e.message);
+        Halt(1);
+      end;
   end;
   pr.Free();