index fb2729b52140edaa31de46eeae41285450032d01..12d926f937c309fc94ff6c7b186cbe4be50491e9 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
implementation
uses
implementation
uses
- e_input, e_log, g_window, g_net, g_console,
- g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic, r_game,
- wadreader, g_system, utils, hashtable;
+ {$IFDEF ENABLE_MENU}
+ g_gui, g_menu,
+ {$ENDIF}
+ {$IFNDEF HEADLESS}
+ r_render, g_system,
+ {$ENDIF}
+ e_input, e_log, g_net, g_console,
+ g_map, g_game, g_sound, g_options, g_language, g_basic,
+ wadreader, utils, hashtable;
// ////////////////////////////////////////////////////////////////////////// //
// ////////////////////////////////////////////////////////////////////////// //
//==========================================================================
function GetTimerMS (): Int64;
begin
//==========================================================================
function GetTimerMS (): Int64;
begin
- Result := sys_GetTicks() {div 1000};
+ Result := GetTickCount64() {div 1000};
end;
end;
if gConsoleShow or gChatShow then
Exit;
if gConsoleShow or gChatShow then
Exit;
- qm := sys_HandleInput(); // this updates kbd
+ {$IFDEF HEADLESS}
+ qm := True;
+ {$ELSE}
+ qm := sys_HandleInput(); // this updates kbd
+ {$ENDIF}
if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or
if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or
SL := nil;
ST := nil;
gState := STATE_MENU;
SL := nil;
ST := nil;
gState := STATE_MENU;
+{$IFDEF ENABLE_MENU}
g_GUI_ShowWindow('MainMenu');
g_GUI_ShowWindow('NetGameMenu');
g_GUI_ShowWindow('NetClientMenu');
g_Sound_PlayEx(WINDOW_CLOSESOUND);
g_GUI_ShowWindow('MainMenu');
g_GUI_ShowWindow('NetGameMenu');
g_GUI_ShowWindow('NetClientMenu');
g_Sound_PlayEx(WINDOW_CLOSESOUND);
+{$ENDIF}
Exit;
end;
Exit;
end;
begin
slWaitStr := _lc[I_NET_SLIST_WAIT];
begin
slWaitStr := _lc[I_NET_SLIST_WAIT];
- r_Game_Draw;
+{$IFNDEF HEADLESS}
+ r_Render_Draw;
sys_Repaint;
sys_Repaint;
+{$ENDIF}
if g_Net_Slist_Fetch(SL) then
begin
if g_Net_Slist_Fetch(SL) then
begin
Srv := GetServerFromTable(slSelection, SL, ST);
if Srv.Password then
begin
Srv := GetServerFromTable(slSelection, SL, ST);
if Srv.Password then
begin
+{$IFDEF ENABLE_MENU}
PromptIP := Srv.IP;
PromptPort := Srv.Port;
PromptIP := Srv.IP;
PromptPort := Srv.Port;
+{$ENDIF}
gState := STATE_MENU;
gState := STATE_MENU;
+{$IFDEF ENABLE_MENU}
g_GUI_ShowWindow('ClientPasswordMenu');
g_GUI_ShowWindow('ClientPasswordMenu');
+{$ENDIF}
SL := nil;
ST := nil;
slReturnPressed := True;
SL := nil;
ST := nil;
slReturnPressed := True;