X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.dpr;h=e81b4ae970bdaa871bed0e864ebf94105417be26;hb=313f52c372a4fe70cdfb3fdfaf845b95e05be9d4;hp=72e2c3b425508cb0a4f58f9a3b3b4be2fea84d8f;hpb=9d2405d500b579d36f6e2330762a6cd51fbce581;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.dpr
index 72e2c3b..e81b4ae 100644
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.dpr
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE ../shared/a_modes.inc}
 program Doom2DF;
 {$IFNDEF HEADLESS}
   {$IFDEF WINDOWS}
@@ -39,7 +39,10 @@ program Doom2DF;
 {$ENDIF}
 
 uses
+  mempool in '../shared/mempool.pas',
   conbuf in '../shared/conbuf.pas',
+  geom in '../shared/geom.pas',
+  math,
   GL,
   GLExt,
   SDL2 in '../lib/sdl2/sdl2.pas',
@@ -52,15 +55,13 @@ uses
   e_log in '../engine/e_log.pas',
   e_sound in '../engine/e_sound.pas',
   e_texture in '../engine/e_texture.pas',
-  e_fixedbuffer in '../engine/e_fixedbuffer.pas',
+  e_msg in '../engine/e_msg.pas',
   utils in '../shared/utils.pas',
   xstreams in '../shared/xstreams.pas',
   sfs in '../sfs/sfs.pas',
   sfsPlainFS in '../sfs/sfsPlainFS.pas',
   sfsZipFS in '../sfs/sfsZipFS.pas',
   wadreader in '../shared/wadreader.pas',
-  MAPSTRUCT in '../shared/MAPSTRUCT.pas',
-  MAPREADER in '../shared/MAPREADER.pas',
   MAPDEF in '../shared/MAPDEF.pas',
   CONFIG in '../shared/CONFIG.pas',
   g_basic in 'g_basic.pas',
@@ -71,7 +72,6 @@ uses
   g_netmaster in 'g_netmaster.pas',
   g_res_downloader in 'g_res_downloader.pas',
   g_grid in 'g_grid.pas',
-  z_aabbtree in 'z_aabbtree.pas',
   g_game in 'g_game.pas',
   g_gfx in 'g_gfx.pas',
   g_gui in 'g_gui.pas',
@@ -90,6 +90,7 @@ uses
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
+  g_holmes in 'g_holmes.pas',
   SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
@@ -99,13 +100,22 @@ uses
 {$ENDIF}
   xprofiler in '../shared/xprofiler.pas',
   binheap in '../shared/binheap.pas',
-  BinEditor in '../shared/BinEditor.pas',
+  hashtable in '../shared/hashtable.pas',
+  idpool in '../shared/idpool.pas',
+  xparser in '../shared/xparser.pas',
+  xdynrec in '../shared/xdynrec.pas',
+  exoma in '../shared/exoma.pas',
   envvars in '../shared/envvars.pas',
   g_panel in 'g_panel.pas',
   g_language in 'g_language.pas',
   ImagingTypes,
   Imaging,
-  ImagingUtility;
+  ImagingUtility,
+  sdlcarcass in '../gx/sdlcarcass.pas',
+  glgfx in '../gx/glgfx.pas',
+  gh_ui_common in '../gx/gh_ui_common.pas',
+  gh_ui in '../gx/gh_ui.pas',
+  gh_flexlay in '../gx/gh_flexlay.pas';
 
 {$IFDEF WINDOWS}
   {$R *.res}
@@ -115,22 +125,43 @@ uses
 var
   f: Integer;
   noct: Boolean = false;
+  //tfo: Text;
 begin
+  SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide, exOverflow, exUnderflow, exPrecision]); //k8: fuck off, that's why
   for f := 1 to ParamCount do
   begin
          if ParamStr(f) = '--gdb' then noct := true
-    else if ParamStr(f) = '--log' then conbufDumpToStdOut := true;
+    else if ParamStr(f) = '--log' then conbufDumpToStdOut := true
+    else if ParamStr(f) = '--safe-log' then e_SetSafeSlowLog(true);
   end;
   if noct then
+  begin
     Main()
+  end
   else
+  begin
     try
       Main();
-      e_WriteLog('Shutdown with no errors.', MSG_NOTIFY);
+      e_WriteLog('Shutdown with no errors.', TMsgType.Notify);
     except
-      on E: Exception do
-        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_MSG], [E.Message]), MSG_FATALERROR);
+      on e: Exception do
+        begin
+          e_WriteStackTrace(e.message);
+          //e_WriteLog(Format(_lc[I_SYSTEM_ERROR_MSG], [E.Message]), MSG_FATALERROR);
+          (*
+          AssignFile(tfo, GameDir+'/trace.log');
+          {$I-}
+          Append(tfo);
+          if (IOResult <> 0) then Rewrite(tfo);
+          if (IOResult = 0) then begin writeln(tfo, '====================='); DumpExceptionBackTrace(tfo); CloseFile(tfo); end;
+          *)
+        end
       else
-        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [NativeUInt(ExceptAddr())]), MSG_FATALERROR);
+        begin
+          //e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [NativeUInt(ExceptAddr())]), MSG_FATALERROR);
+          e_WriteStackTrace('FATAL ERROR');
+        end;
     end;
+  end;
+  e_DeinitLog();
 end.