diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 960eb9eeafaccd3325d119a7a042c03b5cfd796f..627ebb0162401d14d3384fa5963f709ce8d0ee4d 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
implementation
uses
-{$IFDEF USE_NANOGL}
- nanoGL,
-{$ELSE}
- GL, GLExt,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF USE_WATT32}
+ Watt32,
+{$ENDIF}
+{$IFDEF USE_LIBSOCKET}
+ Socket,
+{$ENDIF}
+{$IFDEF ENABLE_HOLMES}
+ g_holmes, fui_wadread, fui_style, fui_gfx_gl,
{$ENDIF}
SDL2, 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_holmes,
- utils, conbuf, envvars, fui_wadread, fui_style,
- fui_gfx_gl, xparser;
+ g_menu, g_language, g_net, g_touch,
+ utils, conbuf, envvars,
+ xparser;
var
procedure Main();
var
sdlflags: LongWord;
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded: Boolean;
{$ENDIF}
begin
TMsgType.Notify
);
- e_WriteLog('Read config file', TMsgType.Notify);
- g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+{$IFDEF USE_WATT32}
+ sdlflags := sock_init;
+ {$IFDEF USE_SDL2ALLEGRO}
+ hires_timer(0);
+ init_userSuppliedTimerTick;
+ {$ENDIF}
+ e_WriteLog('Wattcp Init: (' + IntToStr(sdlflags) + ') ' + sock_init_err(sdlflags), TMsgType.Notify);
+ e_WriteLog('Wattcp Version: ' + wattcpVersion, TMsgType.Notify);
+ e_WriteLog('Wattcp Capabilities: ' + wattcpCapabilities, TMsgType.Notify);
+ e_WriteLog('Wattcp IP: ' +
+ IntToStr(my_ip_addr div 16777216 mod 256) + '.' +
+ IntToStr(my_ip_addr div 65536 mod 256) + '.' +
+ IntToStr(my_ip_addr div 256 mod 256) + '.' +
+ IntToStr(my_ip_addr mod 256),
+ TMsgType.Notify
+ );
+{$ENDIF}
+{$IFDEF USE_LIBSOCKET}
+ sdlflags := __lsck_init;
+ e_WriteLog('libsocket Init: (' + IntToStr(sdlflags) + ') ' + lsck_strerror(sdlflags), TMsgType.Notify);
+ e_WriteLog('libsocket Version: ' + __lsck_get_version, TMsgType.Notify);
+{$ENDIF}
{$IFDEF HEADLESS}
conbufDumpToStdOut := true;
{$ENDIF}
e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
- //GetSystemDefaultLCID()
-
- //e_WriteLog('Read language file', MSG_NOTIFY);
- //g_Language_Load(DataDir + gLanguage + '.txt');
- e_WriteLog(gLanguage, TMsgType.Notify);
- g_Language_Set(gLanguage);
-
{$IFDEF HEADLESS}
{$IFDEF USE_SDLMIXER}
sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
if SDL_Init(sdlflags) < 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
+ e_WriteLog('Read config file', TMsgType.Notify);
+ g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+
+ //GetSystemDefaultLCID()
+
+ //e_WriteLog('Read language file', MSG_NOTIFY);
+ //g_Language_Load(DataDir + gLanguage + '.txt');
+ e_WriteLog(gLanguage, TMsgType.Notify);
+ g_Language_Set(gLanguage);
+
{$IFNDEF HEADLESS}
{$IFNDEF ANDROID}
SDL_StartTextInput();
{$ENDIF}
{$ENDIF}
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
begin
e_WriteLog('Init Input', TMsgType.Notify);
e_InitInput();
+ g_Touch_Init;
if (e_JoysticksAvailable > 0) then
e_WriteLog('Input: Joysticks available.', TMsgType.Notify)