X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=7d0dfb264e1daefb77761bbb7fc4a3ba0d935380;hp=222002baa53a1a312be411a51bcc1a3f6253431a;hb=dbf81afaefeb52e53d2b8af3a782277229c5adaa;hpb=40aef8e7c0887d12cec058787540e83f0badf4dd

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 222002b..7d0dfb2 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -38,7 +38,7 @@ implementation
 uses
 {$INCLUDE ../nogl/noGLuses.inc}
 {$IFDEF ENABLE_HOLMES}
-  g_holmes, fui_wadread, fui_style, fui_gfx_gl,
+  g_holmes, sdlcarcass, fui_ctls, fui_wadread, fui_style, fui_gfx_gl,
 {$ENDIF}
   wadreader, e_log, g_window,
   e_graphics, e_input, g_game, g_console, g_gui,
@@ -143,15 +143,27 @@ begin
     end;
   end;
   g_holmes_imfunctional := not flexloaded;
+
+  if (not g_holmes_imfunctional) then
+  begin
+    uiInitialize();
+    uiContext.font := 'win14';
+  end;
+
+  if assigned(oglInitCB) then oglInitCB;
 {$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}
+  {$WARNINGS OFF}
+    SDLMain();
+  {$WARNINGS ON}
+
+  {$IFDEF ENABLE_HOLMES}
+    if assigned(oglDeinitCB) then oglDeinitCB;
+  {$ENDIF}
 
   sys_Final;
 end;