diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 2f68e2e604abd00f6b22d791987d15519e82adc5..d60f2ddaa6de5fbf4940eff6a8d95f0e473b4299 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
{$IFDEF ENABLE_HOLMES}
g_holmes, fui_wadread, fui_style, fui_gfx_gl,
{$ENDIF}
- SDL2, wadreader, e_log, g_window,
+{$IFDEF USE_SDL2}
+ SDL2,
+{$ENDIF}
+ wadreader, e_log, g_window,
e_graphics, e_input, g_game, g_console, g_gui,
e_sound, g_options, g_sound, g_player, g_basic,
g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
- g_menu, g_language, g_net, g_touch,
+ g_menu, g_language, g_net, g_touch, g_system, g_res_downloader,
utils, conbuf, envvars,
xparser;
{$ENDIF}
e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
+{$IFDEF USE_SDL2}
{$IFDEF HEADLESS}
{$IFDEF USE_SDLMIXER}
sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
if SDL_Init(sdlflags) < 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
+{$ENDIF}
e_WriteLog('Read config file', TMsgType.Notify);
g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
e_WriteLog(gLanguage, TMsgType.Notify);
g_Language_Set(gLanguage);
+{$IFNDEF USE_SDL2}
+ sys_Init;
+{$ENDIF}
+
{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
g_holmes_imfunctional := not flexloaded;
{$ENDIF}
+ //g_Res_CreateDatabases(); // it will be done before connecting to the server for the first time
+
e_WriteLog('Entering SDLMain', TMsgType.Notify);
{$WARNINGS OFF}
SDLMain();
{$WARNINGS ON}
+{$IFDEF USE_SDL2}
e_WriteLog('Releasing SDL', TMsgType.Notify);
SDL_Quit();
+{$ELSE}
+ sys_Final;
+{$ENDIF}
end;
procedure Init();
procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}
var
Msg: g_gui.TMessage;
+{$ENDIF}
begin
+{$IFNDEF HEADLESS}
case K of
VK_ESCAPE: // <Esc>:
begin
end;
end;
end;
+{$ENDIF}
end;