X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=374d42051c8f9f107acf6f4ff789d349799bf441;hb=1e39821d82608a679d73e19dcafcbada5f6bb265;hp=1eaf7b9cb50d17b97fdc36a52f5fa733278e4a14;hpb=fe9a6c821bf899d3c1c3aed15d049fd741b55d35;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 1eaf7b9..374d420 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -41,7 +41,7 @@ uses {$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; @@ -91,10 +91,10 @@ begin e_SetRendertarget(True); e_SetViewPort(0, 0, gScreenWidth, gScreenHeight); - DrawMenuBackground('INTER'); + r_Game_DrawMenuBackground('INTER'); 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); @@ -145,15 +145,9 @@ begin 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(); - end; end; - if NetMode = NET_SERVER then g_Net_Flush(); - g_Map_ProfilersEnd(); g_Mons_ProfilersEnd();