diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index d60f2ddaa6de5fbf4940eff6a8d95f0e473b4299..0269a4c9315d2d700320061cd60f4b02774c4354 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
uses
{$INCLUDE ../nogl/noGLuses.inc}
{$IFDEF ENABLE_HOLMES}
- g_holmes, fui_wadread, fui_style, fui_gfx_gl,
-{$ENDIF}
-{$IFDEF USE_SDL2}
- SDL2,
+ 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,
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();
{$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');
+ e_InitInput;
- if SDL_Init(sdlflags) < 0 then
- raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
-{$ENDIF}
-
- 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);
-{$IFNDEF USE_SDL2}
- sys_Init;
-{$ENDIF}
-
{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
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}
-{$IFDEF USE_SDL2}
- e_WriteLog('Releasing SDL', TMsgType.Notify);
- SDL_Quit();
-{$ELSE}
sys_Final;
-{$ENDIF}
end;
procedure Init();
NoSound := False;
{$ENDIF}
- e_WriteLog('Init Input', TMsgType.Notify);
- e_InitInput();
g_Touch_Init;
(*