X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ftools%2Fmapcvt.dpr;h=799de30e10e7e20f9c6361f85be69bd22c38bb05;hb=refs%2Fheads%2Ffbo;hp=476179c3713545b0fa8418190d56e750d29cfe4b;hpb=48fa53d341e432475432901a339f1ae81fda7809;p=d2df-sdl.git diff --git a/src/tools/mapcvt.dpr b/src/tools/mapcvt.dpr index 476179c..799de30 100644 --- a/src/tools/mapcvt.dpr +++ b/src/tools/mapcvt.dpr @@ -8,6 +8,7 @@ uses 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', @@ -31,7 +32,7 @@ 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; @@ -98,9 +99,9 @@ begin end; try - stt := curTimeMicro(); + stt := getTimeMicro(); map := dfmapdef.parseMap(st, @wasbin); - stt := curTimeMicro()-stt; + stt := getTimeMicro()-stt; if wasbin then write('binary') else write('text'); writeln(' map parsed in ', stt div 1000, '.', stt mod 1000, ' milliseconds'); except @@ -132,9 +133,9 @@ begin begin // write binary map lostdata := false; - stt := curTimeMicro(); + stt := getTimeMicro(); map.writeBinTo(lostdata, st); - stt := curTimeMicro()-stt; + stt := getTimeMicro()-stt; if lostdata then writeln('***WARNING! some data was lost due to binary format limitations!'); write('binary'); end @@ -142,9 +143,9 @@ begin begin // write text map wr := TFileTextWriter.Create(st); - stt := curTimeMicro(); + stt := getTimeMicro(); map.writeTo(wr); - stt := curTimeMicro()-stt; + stt := getTimeMicro()-stt; wr.Free(); write('text'); end;