particles: fixed "in liquid" check bug

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

diff --git a/src/tools/mapcvt.dpr b/src/tools/mapcvt.dpr
index 71784e27c7b9f02124177b401616b33a2e3f1fe8..de1c0a36427acbfc0d0d6e84b07ea8c8230228f7 100644 (file)
--- a/src/tools/mapcvt.dpr
+++ b/src/tools/mapcvt.dpr
@@ -1,5 +1,7 @@
 {$INCLUDE ../shared/a_modes.inc}
-{$APPTYPE CONSOLE}
+{$IFDEF WINDOWS}
+  {$APPTYPE CONSOLE}
+{$ENDIF}
 
 uses
   SysUtils, Classes,
@@ -11,6 +13,7 @@ uses
   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',
@@ -101,7 +104,7 @@ begin
     stt := curTimeMicro();
     map := dfmapdef.parseBinMap(st);
     stt := curTimeMicro()-stt;
-    writeln('binary map parsed in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+    writeln('binary map parsed in ', stt div 1000, '.', stt mod 1000, ' milliseconds');
     st.Free();
   end
   else
@@ -113,7 +116,7 @@ begin
       stt := curTimeMicro();
       map := dfmapdef.parseMap(pr);
       stt := curTimeMicro()-stt;
-      writeln('text map parsed in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+      writeln('text map parsed in ', stt div 1000, '.', stt mod 1000, ' milliseconds');
     except on e: Exception do
       begin
         writeln('ERROR at (', pr.line, ',', pr.col, '): ', e.message);
@@ -123,6 +126,8 @@ begin
     pr.Free();
   end;
 
+  {$IF DEFINED(D2D_DYNREC_PROFILER)}xdynDumpProfiles();{$ENDIF}
+
   assert(totext >= 0);
 
   writeln('writing "', outname, '"...');
@@ -133,7 +138,7 @@ begin
     stt := curTimeMicro();
     map.writeBinTo(st);
     stt := curTimeMicro()-stt;
-    writeln('binary map written in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+    writeln('binary map written in ', stt div 1000, '.', stt mod 1000, ' milliseconds');
   end
   else
   begin
@@ -142,7 +147,7 @@ begin
     stt := curTimeMicro();
     map.writeTo(wr);
     stt := curTimeMicro()-stt;
-    writeln('text map written in ', stt div 1000, '.', stt mod 1000, ' microseconds');
+    writeln('text map written in ', stt div 1000, '.', stt mod 1000, ' milliseconds');
     wr.Free();
   end;
 end.