X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.dpr;h=a47b72d1db22465bab5092fbcc08ba1400e3a82b;hb=bab60f8ad58f03e8a35dbb44aba77bb9ff9201f9;hp=17f17b77fb2922dff852b8e48a958e8a61ca4ecf;hpb=6657de7c4f97ab3bba2802f075332c379e22e393;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.dpr
index 17f17b7..a47b72d 100644
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.dpr
@@ -47,26 +47,18 @@ uses
   SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
 {$ENDIF}
   ENet in '../lib/enet/enet.pp',
-  ENetTypes in '../lib/enet/enettypes.pp',
-  ENetList in '../lib/enet/enetlist.pp',
-  ENetTime in '../lib/enet/enettime.pp',
-  ENetProtocol in '../lib/enet/enetprotocol.pp',
-  ENetCallbacks in '../lib/enet/enetcallbacks.pp',
-  ENetPlatform in '../lib/enet/enetplatform.pp',
   e_graphics in '../engine/e_graphics.pas',
   e_input in '../engine/e_input.pas',
   e_log in '../engine/e_log.pas',
   e_sound in '../engine/e_sound.pas',
-  e_textures in '../engine/e_textures.pas',
-  e_fixedbuffer in '../engine/e_fixedbuffer.pas',
+  e_texture in '../engine/e_texture.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',
@@ -76,6 +68,7 @@ uses
   g_nethandler in 'g_nethandler.pas',
   g_netmaster in 'g_netmaster.pas',
   g_res_downloader in 'g_res_downloader.pas',
+  g_grid in 'g_grid.pas',
   g_game in 'g_game.pas',
   g_gfx in 'g_gfx.pas',
   g_gui in 'g_gui.pas',
@@ -94,6 +87,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',
@@ -101,15 +95,19 @@ uses
   fmodpresets in '../lib/FMOD/fmodpresets.pas',
   fmodtypes in '../lib/FMOD/fmodtypes.pas',
 {$ENDIF}
+  xprofiler in '../shared/xprofiler.pas',
+  binheap in '../shared/binheap.pas',
+  hashtable in '../shared/hashtable.pas',
+  idpool in '../shared/idpool.pas',
+  xparser in '../shared/xparser.pas',
+  xdynrec in '../shared/xdynrec.pas',
   BinEditor in '../shared/BinEditor.pas',
+  envvars in '../shared/envvars.pas',
   g_panel in 'g_panel.pas',
   g_language in 'g_language.pas',
   ImagingTypes,
   Imaging,
-  ImagingUtility,
-  lua in '../lib/lua/lua.pas',
-  lualib in '../lib/lua/lualib.pas',
-  lauxlib in '../lib/lua/lauxlib.pas';
+  ImagingUtility;
 
 {$IFDEF WINDOWS}
   {$R *.res}
@@ -119,22 +117,40 @@ uses
 var
   f: Integer;
   noct: Boolean = false;
+  tfo: Text;
 begin
   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);
     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], [LongWord(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.