diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.dpr
index a9044fb9d614cff917282b7baa15a337246458a7..7daaaea83727b95ee5252ab62194eaee6e8ce732 100644 (file)
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.dpr
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
* 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}
program Doom2DF;
{$IFNDEF HEADLESS}
{$IFDEF WINDOWS}
{$ENDIF}
uses
{$ENDIF}
uses
+ mempool in '../shared/mempool.pas',
conbuf in '../shared/conbuf.pas',
conbuf in '../shared/conbuf.pas',
+ geom in '../shared/geom.pas',
+ math,
GL,
GLExt,
SDL2 in '../lib/sdl2/sdl2.pas',
GL,
GLExt,
SDL2 in '../lib/sdl2/sdl2.pas',
SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
{$ENDIF}
ENet in '../lib/enet/enet.pp',
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_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',
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',
MAPDEF in '../shared/MAPDEF.pas',
CONFIG in '../shared/CONFIG.pas',
g_basic in 'g_basic.pas',
g_nethandler in 'g_nethandler.pas',
g_netmaster in 'g_netmaster.pas',
g_res_downloader in 'g_res_downloader.pas',
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',
g_game in 'g_game.pas',
g_gfx in 'g_gfx.pas',
g_gui in 'g_gui.pas',
g_triggers in 'g_triggers.pas',
g_weapons in 'g_weapons.pas',
g_window in 'g_window.pas',
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',
SysUtils,
{$IFDEF USE_FMOD}
fmod in '../lib/FMOD/fmod.pas',
fmodpresets in '../lib/FMOD/fmodpresets.pas',
fmodtypes in '../lib/FMOD/fmodtypes.pas',
{$ENDIF}
fmodpresets in '../lib/FMOD/fmodpresets.pas',
fmodtypes in '../lib/FMOD/fmodtypes.pas',
{$ENDIF}
- BinEditor in '../shared/BinEditor.pas',
+ 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',
+ exoma in '../shared/exoma.pas',
+ envvars in '../shared/envvars.pas',
g_panel in 'g_panel.pas',
g_language in 'g_language.pas',
ImagingTypes,
Imaging,
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';
{$IFDEF WINDOWS}
{$R *.res}
{$IFDEF WINDOWS}
{$R *.res}
var
f: Integer;
noct: Boolean = false;
var
f: Integer;
noct: Boolean = false;
+ //tfo: Text;
begin
begin
- for f := 1 to ParamCount do if ParamStr(f) = '--gdb' then noct := true;
+ 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) = '--safe-log' then e_SetSafeSlowLog(true);
+ end;
if noct then
if noct then
+ begin
Main()
Main()
+ end
else
else
+ begin
try
Main();
try
Main();
- e_WriteLog('Shutdown with no errors.', MSG_NOTIFY);
+ e_WriteLog('Shutdown with no errors.', TMsgType.Notify);
except
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
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;
+ end;
+ e_DeinitLog();
end.
end.