From b5a731f3a67b80b09568512fe4007327f63d664c Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Thu, 10 May 2012 03:48:36 +0000
Subject: [PATCH] - Move player prediction calls into D_Display().

SVN r3636 (trunk)
---
 src/d_main.cpp    | 3 +++
 src/r_main.cpp    | 2 --
 src/r_utility.cpp | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index b3c8f5f56..a44399ff9 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -106,6 +106,7 @@
 #include "po_man.h"
 #include "resourcefiles/resourcefile.h"
 #include "r_renderer.h"
+#include "p_local.h"
 
 #ifdef USE_POLYMOST
 #include "r_polymost.h"
@@ -773,7 +774,9 @@ void D_Display ()
 			screen->SetBlendingRect(viewwindowx, viewwindowy,
 				viewwindowx + viewwidth, viewwindowy + viewheight);
 			P_CheckPlayerSprites();
+			P_PredictPlayer(&players[consoleplayer]);
 			Renderer->RenderView(&players[consoleplayer]);
+			P_UnPredictPlayer();
 			if ((hw2d = screen->Begin2D(viewactive)))
 			{
 				// Redraw everything every frame when using 2D accel
diff --git a/src/r_main.cpp b/src/r_main.cpp
index ae87608c4..80edd18d6 100644
--- a/src/r_main.cpp
+++ b/src/r_main.cpp
@@ -34,7 +34,6 @@
 #include "doomstat.h"
 #include "m_random.h"
 #include "m_bbox.h"
-#include "p_local.h"
 #include "r_local.h"
 #include "r_plane.h"
 #include "r_bsp.h"
@@ -861,7 +860,6 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
 	}
 	WallMirrors.Clear ();
 	interpolator.RestoreInterpolations ();
-	P_UnPredictPlayer();
 	R_SetupBuffer ();
 
 	// If we don't want shadered colormaps, NULL it now so that the
diff --git a/src/r_utility.cpp b/src/r_utility.cpp
index 9b13c2a49..46da3e225 100644
--- a/src/r_utility.cpp
+++ b/src/r_utility.cpp
@@ -744,10 +744,6 @@ void R_SetupFrame (AActor *actor)
 		{
 			camera = player->camera = player->mo;
 		}
-		if (camera == actor)
-		{
-			P_PredictPlayer (player);
-		}
 	}
 	else
 	{