diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 874907ed63c9598bfe9a9b214617787588b3cb8e..4e38444dcb9c78e5ce6a3e0c0e04ab14ba9923f5 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}
+{$IF DEFINED(GO32V2) AND NOT DEFINED(USE_ENETWRAP)}
+ Watt32,
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
g_holmes, fui_wadread, fui_style, fui_gfx_gl,
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);
+{$IF DEFINED(GO32V2) AND NOT DEFINED(USE_ENETWRAP)}
+ sdlflags := sock_init;
+ {$IFDEF USE_SDL2ALLEGRO}
+ hires_timer(0);
+ init_userSuppliedTimerTick;
+ {$ENDIF}
+ e_WriteLog('Wattcp Init: (' + IntToStr(sdlflags) + ') ' + sock_init_err, 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 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();