X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=d3850c8e666e10422bfc13eeeb1a587be1c76b0c;hb=54de73776fff070d5c24b38ac996cd02e76fca61;hp=37d979111dff1a34f01f50f30a3287c77f901493;hpb=0e32b76121dd532a73259cbdbf15c43ffdedd5c9;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 37d9791..d3850c8 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -22,7 +22,7 @@ uses function SDLMain (): Integer; procedure ResetTimer (); -procedure ProcessLoading (forceUpdate: Boolean=false); +procedure ProcessLoading (forceUpdate: Boolean = False); var gwin_dump_extensions: Boolean = false; @@ -68,7 +68,7 @@ var prevLoadingUpdateTime: UInt64 = 0; {$ENDIF} -procedure ProcessLoading (forceUpdate: Boolean=false); +procedure ProcessLoading (forceUpdate: Boolean); {$IFNDEF HEADLESS} var stt: UInt64; @@ -108,14 +108,13 @@ begin e_SoundUpdate(); - if NetMode = NET_SERVER then - begin - g_Net_Host_Update(); - end - else - begin - if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading(); - end; + // TODO: At the moment, I left here only host network processing, because the client code must + // handle network events on its own. Otherwise separate network cases that use different calls to + // enet_host_service() WILL lose their packets (for example, resource downloading). So they have + // to handle everything by themselves. But in general, this MUST be removed completely, since + // updating the window should never affect the network. Use single enet_host_service(), period. + if NetMode = NET_SERVER + then g_Net_Host_Update(); end;