X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=45432615c04762ff01a513553de4f9b7822043af;hb=7f50d798c193f8a57a3c736c81615ef932915e9a;hp=5ea72be400acb2a56f9809a70217175121492ddc;hpb=a07765f3e726f5efff9fbaff0ac8917b0924c3ac;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 5ea72be..4543261 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -38,13 +38,13 @@ 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}
-  SDL2, wadreader, e_log, g_window,
+  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;
 
@@ -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,35 +82,14 @@ begin
 {$ENDIF}
   e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
 
-{$IFDEF HEADLESS}
- {$IFDEF USE_SDLMIXER}
-  sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
-  // HACK: shit this into env and hope for the best
-  SetEnvVar('SDL_AUDIODRIVER', 'dummy');
- {$ELSE}
-  sdlflags := SDL_INIT_TIMER or $00004000;
- {$ENDIF}
-{$ELSE}
- {$IFDEF USE_SDLMIXER}
-  {*sdlflags := SDL_INIT_EVERYTHING;*}
-  sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
- {$ELSE}
-  sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
- {$ENDIF}
-{$ENDIF}
-
-  SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0');
+  e_InitInput;
 
-  if SDL_Init(sdlflags) < 0 then
-    raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
-
-  e_WriteLog('Read config file', TMsgType.Notify);
+  sys_Init;
   g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+  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);
 
@@ -159,18 +136,29 @@ 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();
+  //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}
 
-  e_WriteLog('Releasing SDL', TMsgType.Notify);
-  SDL_Quit();
+  sys_Final;
 end;
 
 procedure Init();
@@ -189,8 +177,6 @@ begin
   NoSound := False;
 {$ENDIF}
 
-  e_WriteLog('Init Input', TMsgType.Notify);
-  e_InitInput();
   g_Touch_Init;
 
 (*
@@ -218,12 +204,12 @@ begin
   e_WriteLog('Releasing engine', TMsgType.Notify);
   e_ReleaseEngine();
 
-  e_WriteLog('Releasing Input', TMsgType.Notify);
+  e_WriteLog('Releasing input', TMsgType.Notify);
   e_ReleaseInput();
 
   if not gNoSound then
   begin
-    e_WriteLog('Releasing FMOD', TMsgType.Notify);
+    e_WriteLog('Releasing sound', TMsgType.Notify);
     e_ReleaseSoundSystem();
   end;
 end;