more sfs refactoring

[d2df-sdl.git] / src / game / Doom2DF.dpr

diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.dpr
index 57f516d65c367b608fdc4144f855048467fd1182..5a10057095b200a1a0a8c1daf75c2ef5505994aa 100644 (file)
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.dpr
@@ -1,6 +1,8 @@
 program Doom2DF;
-{$IFDEF WIN32}
-  {$APPTYPE GUI}
+{$IFNDEF HEADLESS}
+  {$IFDEF WIN32}
+    {$APPTYPE GUI}
+  {$ENDIF}
 {$ENDIF}
 {$HINTS OFF}
 
@@ -43,11 +45,9 @@ uses
   sfs in '../sfs/sfs.pas',
   sfsPlainFS in '../sfs/sfsPlainFS.pas',
   sfsZipFS in '../sfs/sfsZipFS.pas',
-  sfsMemFS in '../sfs/sfsMemFS.pas',
-  xstreams in '../sfs/xstreams.pas',
+  xstreams in '../shared/xstreams.pas',
   utils in '../shared/utils.pas',
-  WADEDITOR in '../shared/WADEDITOR.pas',
-  WADSTRUCT in '../shared/WADSTRUCT.pas',
+  wadreader in '../shared/wadreader.pas',
   MAPSTRUCT in '../shared/MAPSTRUCT.pas',
   MAPREADER in '../shared/MAPREADER.pas',
   MAPDEF in '../shared/MAPDEF.pas',
@@ -93,14 +93,21 @@ uses
   {$R CustomRes.res}
 {$ENDIF}
 
+var
+  f: Integer;
+  noct: Boolean = false;
 begin
-  try
-    Main();
-    e_WriteLog('Shutdown with no errors.', MSG_NOTIFY);
-  except
-    on E: Exception do
-      e_WriteLog(Format(_lc[I_SYSTEM_ERROR_MSG], [E.Message]), MSG_FATALERROR);
-    else
-      e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [LongWord(ExceptAddr())]), MSG_FATALERROR);
-  end;
+  for f := 1 to ParamCount do if ParamStr(f) = '--gdb' then noct := true;
+  if noct then
+    Main()
+  else
+    try
+      Main();
+      e_WriteLog('Shutdown with no errors.', MSG_NOTIFY);
+    except
+      on E: Exception do
+        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_MSG], [E.Message]), MSG_FATALERROR);
+      else
+        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [LongWord(ExceptAddr())]), MSG_FATALERROR);
+    end;
 end.