diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index c3741bc1ec0ab207be3c786a14513da0b4d397f8..6a6df2af907e9a4c3f4d83943bb6ac24013ecc87 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
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}
{$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,
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_menu, g_language, g_net, g_touch, g_system, g_res_downloader,
utils, conbuf, envvars,
xparser;
utils, conbuf, envvars,
xparser;
{$ENDIF}
e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
{$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}
+ e_InitInput;
- SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0');
-
- 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);
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);
e_WriteLog(gLanguage, TMsgType.Notify);
g_Language_Set(gLanguage);
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}
{$ENDIF}
+ //g_Res_CreateDatabases(); // it will be done before connecting to the server for the first time
+
e_WriteLog('Entering SDLMain', TMsgType.Notify);
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();
end;
procedure Init();
NoSound := False;
{$ENDIF}
NoSound := False;
{$ENDIF}
- e_WriteLog('Init Input', TMsgType.Notify);
- e_InitInput();
g_Touch_Init;
(*
g_Touch_Init;
(*