diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 222002baa53a1a312be411a51bcc1a3f6253431a..7d0dfb264e1daefb77761bbb7fc4a3ba0d935380 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
uses
{$INCLUDE ../nogl/noGLuses.inc}
{$IFDEF ENABLE_HOLMES}
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,
{$ENDIF}
wadreader, e_log, g_window,
e_graphics, e_input, g_game, g_console, g_gui,
end;
end;
g_holmes_imfunctional := not flexloaded;
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);
{$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;
sys_Final;
end;