X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=222002baa53a1a312be411a51bcc1a3f6253431a;hp=92c0ff5aa2a35d009fec83e43c69a688f6655cd5;hb=724d5405f0f3fe166b931b1b8b5745b2eb340651;hpb=3c277b2aaae8425a26b2d3badc2f6bf5ad2fd817

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 92c0ff5..222002b 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -39,9 +39,6 @@ uses
 {$INCLUDE ../nogl/noGLuses.inc}
 {$IFDEF ENABLE_HOLMES}
   g_holmes, fui_wadread, fui_style, fui_gfx_gl,
-{$ENDIF}
-{$IFDEF USE_SDL2}
-  SDL2,
 {$ENDIF}
   wadreader, e_log, g_window,
   e_graphics, e_input, g_game, g_console, g_gui,
@@ -87,30 +84,6 @@ begin
 {$ENDIF}
   e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
 
-{$IFDEF USE_SDL2}
-{$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');
-
-  if SDL_Init(sdlflags) < 0 then
-    raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
-{$ENDIF}
-
   e_WriteLog('Init Input', TMsgType.Notify);
   e_InitInput;
 
@@ -125,9 +98,7 @@ begin
   e_WriteLog(gLanguage, TMsgType.Notify);
   g_Language_Set(gLanguage);
 
-{$IFNDEF USE_SDL2}
   sys_Init;
-{$ENDIF}
 
 {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded := true;
@@ -182,12 +153,7 @@ begin
   SDLMain();
 {$WARNINGS ON}
 
-{$IFDEF USE_SDL2}
-  e_WriteLog('Releasing SDL', TMsgType.Notify);
-  SDL_Quit();
-{$ELSE}
   sys_Final;
-{$ENDIF}
 end;
 
 procedure Init();