X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ftools%2Fmapcvt.dpr;h=799de30e10e7e20f9c6361f85be69bd22c38bb05;hb=e6a3d6009b888d4d31b9efba92ec67ee41e90be0;hp=cd02ab9b5d1c4fdf259d4bd281345745eb6bdccb;hpb=2b04301f4303668096c37c21e06af70930f55b7f;p=d2df-sdl.git

diff --git a/src/tools/mapcvt.dpr b/src/tools/mapcvt.dpr
index cd02ab9..799de30 100644
--- a/src/tools/mapcvt.dpr
+++ b/src/tools/mapcvt.dpr
@@ -1,13 +1,23 @@
 {$INCLUDE ../shared/a_modes.inc}
-{$APPTYPE CONSOLE}
+{$IFDEF WINDOWS}
+  {$APPTYPE CONSOLE}
+{$ENDIF}
 
 uses
   SysUtils, Classes,
+  sfs in '../sfs/sfs.pas',
+  sfsPlainFS in '../sfs/sfsPlainFS.pas',
+  sfsZipFS in '../sfs/sfsZipFS.pas',
+  mempool in '../shared/mempool.pas',
   xstreams in '../shared/xstreams.pas',
   xparser in '../shared/xparser.pas',
   xdynrec in '../shared/xdynrec.pas',
   xprofiler in '../shared/xprofiler.pas',
   utils in '../shared/utils.pas',
+  hashtable in '../shared/hashtable.pas',
+  conbuf in '../shared/conbuf.pas',
+  e_log in '../engine/e_log.pas',
+  wadreader in '../shared/wadreader.pas',
   MAPDEF in '../shared/MAPDEF.pas';
 
 
@@ -22,7 +32,12 @@ var
   inname: AnsiString = '';
   outname: AnsiString = '';
   totext: Integer = -1; // <0: guess; force outname extension
-  sign: packed array[0..3] of AnsiChar;
+  //sign: packed array[0..3] of AnsiChar;
+  wad: TWADFile = nil;
+  waddata: Pointer;
+  waddlen: Integer;
+  wasbin: Boolean = false;
+  lostdata: Boolean;
 begin
   if (ParamCount = 0) then
   begin
@@ -35,6 +50,11 @@ begin
   if (ParamCount = 1) then
   begin
     outname := forceFilenameExt(ParamStr(1), '');
+    if isWadPath(outname) then
+    begin
+      outname := SFSReplacePathDelims(g_ExtractFilePathName(outname), '/');
+      if (Length(outname) = 0) then begin writeln('FATAL: can''t guess output name!'); Halt(1); end;
+    end;
   end
   else
   begin
@@ -47,6 +67,10 @@ begin
   end;
   //writeln('outname: [', outname, ']; totext=', totext);
 
+  e_InitWritelnDriver();
+  conbufDumpToStdOut := true;
+  conbufConPrefix := false;
+
   writeln('parsing "mapdef.txt"...');
   //pr := TFileTextParser.Create('mapdef.txt');
   pr := TStrTextParser.Create(defaultMapDef);
@@ -60,35 +84,45 @@ begin
   end;
 
   writeln('parsing "', inname, '"...');
-  st := openDiskFileRO(inname);
-  st.ReadBuffer(sign, 4);
-  st.position := 0;
-  if (sign[0] = 'M') and (sign[1] = 'A') and (sign[2] = 'P') and (sign[3] = #1) then
+
+  if isWadPath(inname) then
   begin
-    // binary map
-    if (totext < 0) then begin outname := forceFilenameExt(outname, '.txt'); totext := 1; end;
-    stt := curTimeMicro();
-    map := dfmapdef.parseBinMap(st);
-    stt := curTimeMicro()-stt;
-    writeln('binary map parsed in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+    wad := TWADFile.Create();
+    wad.ReadFile(g_ExtractWadName(inname));
+    wad.GetMapResource(g_ExtractFilePathName(inname), waddata, waddlen);
+    st := TSFSMemoryChunkStream.Create(waddata, waddlen, true);
+    wad.Free();
   end
   else
   begin
-    // text map
-    if (totext < 0) then begin outname := forceFilenameExt(outname, '.map'); totext := 0; end;
-    pr := TFileTextParser.Create(st);
-    try
-      stt := curTimeMicro();
-      map := dfmapdef.parseMap(pr);
-      stt := curTimeMicro()-stt;
-      writeln('text map parsed in ', stt div 1000, '.', stt mod 1000, ' microseconds');
-    except on e: Exception do
+    st := openDiskFileRO(inname);
+  end;
+
+  try
+    stt := getTimeMicro();
+    map := dfmapdef.parseMap(st, @wasbin);
+    stt := getTimeMicro()-stt;
+    if wasbin then write('binary') else write('text');
+    writeln(' map parsed in ', stt div 1000, '.', stt mod 1000, ' milliseconds');
+  except
+    on e: TDynParseException do
       begin
-        writeln('ERROR at (', pr.line, ',', pr.col, '): ', e.message);
+        writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
         Halt(1);
       end;
-    end;
-    pr.Free();
+    on E: Exception do
+      begin
+        writeln('ERROR: ', e.message);
+        Halt(1);
+      end;
+  end;
+
+  {$IF DEFINED(D2D_DYNREC_PROFILER)}xdynDumpProfiles();{$ENDIF}
+
+  if (totext < 0) then
+  begin
+    if wasbin then begin outname := forceFilenameExt(outname, '.txt'); totext := 1; end
+    else begin outname := forceFilenameExt(outname, '.map'); totext := 0; end;
   end;
 
   assert(totext >= 0);
@@ -98,19 +132,22 @@ begin
   if (totext = 0) then
   begin
     // write binary map
-    stt := curTimeMicro();
-    map.writeBinTo(st);
-    stt := curTimeMicro()-stt;
-    writeln('binary map written in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+    lostdata := false;
+    stt := getTimeMicro();
+    map.writeBinTo(lostdata, st);
+    stt := getTimeMicro()-stt;
+    if lostdata then writeln('***WARNING! some data was lost due to binary format limitations!');
+    write('binary');
   end
   else
   begin
     // write text map
     wr := TFileTextWriter.Create(st);
-    stt := curTimeMicro();
+    stt := getTimeMicro();
     map.writeTo(wr);
-    stt := curTimeMicro()-stt;
-    writeln('text map written in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+    stt := getTimeMicro()-stt;
     wr.Free();
+    write('text');
   end;
+  writeln(' map written in ', stt div 1000, '.', stt mod 1000, ' milliseconds');
 end.