X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=0269a4c9315d2d700320061cd60f4b02774c4354;hb=6b40cfebd192158af012c86aa7fb4d1093807633;hp=7d0dfb264e1daefb77761bbb7fc4a3ba0d935380;hpb=dbf81afaefeb52e53d2b8af3a782277229c5adaa;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 7d0dfb2..0269a4c 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -53,10 +53,8 @@ var
   charbuff: packed array [0..15] of AnsiChar;
 
 procedure Main();
-var
-  sdlflags: LongWord;
-{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
-  flexloaded: Boolean;
+{$IFDEF ENABLE_HOLMES}
+  var flexloaded: Boolean;
 {$ENDIF}
 begin
   e_InitWritelnDriver();
@@ -84,22 +82,17 @@ begin
 {$ENDIF}
   e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
 
-  e_WriteLog('Init Input', TMsgType.Notify);
   e_InitInput;
 
-  e_WriteLog('Read config file', TMsgType.Notify);
+  sys_Init;
   g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
-  g_Console_SysInit;
+  if sys_SetDisplayMode(gScreenWidth, gScreenHeight, gBPP, gFullScreen) = False then
+    raise Exception.Create('Failed to set videomode on startup.');
 
-  //GetSystemDefaultLCID()
-
-  //e_WriteLog('Read language file', MSG_NOTIFY);
-  //g_Language_Load(DataDir + gLanguage + '.txt');
+  g_Console_SysInit;
   e_WriteLog(gLanguage, TMsgType.Notify);
   g_Language_Set(gLanguage);
 
-  sys_Init;
-
 {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded := true;
   if not fuiAddWad('flexui.wad') then