diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index c4d1b0fb73a7984ce18686733833b6189abbac3e..374d42051c8f9f107acf6f4ff789d349799bf441 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
{$INCLUDE ../nogl/noGLuses.inc}
SysUtils, Classes, MAPDEF, Math,
e_graphics, e_log, e_texture, g_main,
{$INCLUDE ../nogl/noGLuses.inc}
SysUtils, Classes, MAPDEF, Math,
e_graphics, e_log, e_texture, g_main,
- g_console, e_input, g_options, g_game,
+ g_console, r_console, e_input, g_options, g_game, r_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
g_map, g_gfx, g_monsters, xprofiler,
g_touch, g_gui, g_system, g_netmaster;
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
g_map, g_gfx, g_monsters, xprofiler,
g_touch, g_gui, g_system, g_netmaster;
e_SetRendertarget(True);
e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
e_SetRendertarget(True);
e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
- DrawMenuBackground('INTER');
+ r_Game_DrawMenuBackground('INTER');
e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
- DrawLoadingStat();
- g_Console_Draw(True);
+ r_Game_DrawLoadingStat();
+ r_Console_Draw(True);
e_SetRendertarget(False);
e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
e_SetRendertarget(False);
e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
begin
flag := true;
for i := 1 to t do
begin
flag := true;
for i := 1 to t do
- begin
- if (NetMode = NET_SERVER) then g_Net_Host_Update()
- else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
Update();
Update();
- end;
end;
end;
- if NetMode = NET_SERVER then g_Net_Flush();
-
g_Map_ProfilersEnd();
g_Mons_ProfilersEnd();
g_Map_ProfilersEnd();
g_Mons_ProfilersEnd();
begin
if (not wMinimized) then
begin
begin
if (not wMinimized) then
begin
- if gPause or not gLerpActors then
+ if gPause or (not gLerpActors) or (gState = STATE_FOLD) then
gLerpFactor := 1.0
else
gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
gLerpFactor := 1.0
else
gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);