zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Edward Richardson 2014-09-26 16:11:52 +12:00
parent 84cf799803
commit e25b91d5a1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d_main.cpp
View File

@ -756,9 +756,9 @@ void D_Display ()
}
screen->SetBlendingRect(viewwindowx, viewwindowy,
viewwindowx + viewwidth, viewwindowy + viewheight);
//P_PredictPlayer(&players[consoleplayer]);
Renderer->RenderView(&players[consoleplayer]);
//P_UnPredictPlayer();
if ((hw2d = screen->Begin2D(viewactive)))
{
// Redraw everything every frame when using 2D accel

7
src/d_net.cpp
View File

@ -1402,13 +1402,10 @@ void NetUpdate (void)
if (NetMode == NET_PeerToPeer)
{
// Try to guess ahead the time it takes to send responses to the slowest node
// [ED850] It seems that there is a bias based on network adaption (which the arbitrator doesn't do),
// so I have set this up to assume one less tic, which appears to balance it out.
int totalavg = 0;
if (net_ticbalance)
{
// We shouldn't adapt if we are already the slower then the arbitrator, otherwise it just adds more latency
// Try to guess ahead the time it takes to send responses to the slowest node
int nodeavg = 0, arbavg = 0;
for (j = 0; j < BACKUPTICS; j++)
@ -1419,12 +1416,14 @@ void NetUpdate (void)
arbavg /= BACKUPTICS;
nodeavg /= BACKUPTICS;
// We shouldn't adapt if we are already the arbitrator isn't what we are waiting for, otherwise it just adds more latency
if (arbavg > nodeavg)
{
lastaverage = totalavg = ((arbavg + nodeavg) / 2);
}
else
{
// Allow room to guess two tics ahead
if (nodeavg > (arbavg + 2) && lastaverage > 0)
lastaverage--;
totalavg = lastaverage;