X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=def9f2914d20b342539c8021c605dc93e39c353f;hp=8142dd83c30f7c1fd14b4a28fe650aec0769415a;hb=9b4492224e2e59560931496e925333bdbe6f2b0e;hpb=1581de2ca25df32e3126a91d6e306e18130656ca

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 8142dd8..def9f29 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -490,20 +490,15 @@ begin
   e_InitInput;
   sys_Init;
 
+  g_Options_SetDefault;
+  g_Options_SetDefaultVideo;
   s := CONFIG_FILENAME;
   if e_FindResource(ConfigDirs, s) = true then
-  begin
-    g_Options_Read(s)
-  end
-  else
-  begin
-    g_Options_SetDefault;
-    g_Options_SetDefaultVideo
-  end;
+    g_Options_Read(s);
+  g_Console_SysInit;
   if sys_SetDisplayMode(gScreenWidth, gScreenHeight, gBPP, gFullScreen) = False then
     raise Exception.Create('Failed to set videomode on startup.');
 
-  g_Console_SysInit;
   e_WriteLog(gLanguage, TMsgType.Notify);
   g_Language_Set(gLanguage);
 
@@ -572,6 +567,7 @@ begin
     if assigned(oglDeinitCB) then oglDeinitCB;
   {$ENDIF}
 
+  g_Console_WriteGameConfig;
   sys_Final;
 end;