read dfconfig.cfg before init

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 3b84f30eb820982eae315c8147e4eccdfdc9458a..92c0ff5aa2a35d009fec83e43c69a688f6655cd5 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -40,11 +40,14 @@ uses
 {$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_res_downloader,
+  g_menu, g_language, g_net, g_touch, g_system, g_res_downloader,
   utils, conbuf, envvars,
   xparser;
 
@@ -84,6 +87,7 @@ begin
 {$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;
@@ -105,9 +109,14 @@ begin
 
   if SDL_Init(sdlflags) < 0 then
     raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
+{$ENDIF}
+
+  e_WriteLog('Init Input', TMsgType.Notify);
+  e_InitInput;
 
   e_WriteLog('Read config file', TMsgType.Notify);
   g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+  g_Console_SysInit;
 
   //GetSystemDefaultLCID()
 
@@ -116,6 +125,10 @@ begin
   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
@@ -169,8 +182,12 @@ begin
   SDLMain();
 {$WARNINGS ON}
 
+{$IFDEF USE_SDL2}
   e_WriteLog('Releasing SDL', TMsgType.Notify);
   SDL_Quit();
+{$ELSE}
+  sys_Final;
+{$ENDIF}
 end;
 
 procedure Init();
@@ -189,8 +206,6 @@ begin
   NoSound := False;
 {$ENDIF}
 
-  e_WriteLog('Init Input', TMsgType.Notify);
-  e_InitInput();
   g_Touch_Init;
 
 (*