mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 23:01:59 +00:00
- Move player prediction calls into D_Display().
SVN r3636 (trunk)
This commit is contained in:
parent
eb03d8e77e
commit
b5a731f3a6
3 changed files with 3 additions and 6 deletions
|
@ -106,6 +106,7 @@
|
||||||
#include "po_man.h"
|
#include "po_man.h"
|
||||||
#include "resourcefiles/resourcefile.h"
|
#include "resourcefiles/resourcefile.h"
|
||||||
#include "r_renderer.h"
|
#include "r_renderer.h"
|
||||||
|
#include "p_local.h"
|
||||||
|
|
||||||
#ifdef USE_POLYMOST
|
#ifdef USE_POLYMOST
|
||||||
#include "r_polymost.h"
|
#include "r_polymost.h"
|
||||||
|
@ -773,7 +774,9 @@ void D_Display ()
|
||||||
screen->SetBlendingRect(viewwindowx, viewwindowy,
|
screen->SetBlendingRect(viewwindowx, viewwindowy,
|
||||||
viewwindowx + viewwidth, viewwindowy + viewheight);
|
viewwindowx + viewwidth, viewwindowy + viewheight);
|
||||||
P_CheckPlayerSprites();
|
P_CheckPlayerSprites();
|
||||||
|
P_PredictPlayer(&players[consoleplayer]);
|
||||||
Renderer->RenderView(&players[consoleplayer]);
|
Renderer->RenderView(&players[consoleplayer]);
|
||||||
|
P_UnPredictPlayer();
|
||||||
if ((hw2d = screen->Begin2D(viewactive)))
|
if ((hw2d = screen->Begin2D(viewactive)))
|
||||||
{
|
{
|
||||||
// Redraw everything every frame when using 2D accel
|
// Redraw everything every frame when using 2D accel
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include "doomstat.h"
|
#include "doomstat.h"
|
||||||
#include "m_random.h"
|
#include "m_random.h"
|
||||||
#include "m_bbox.h"
|
#include "m_bbox.h"
|
||||||
#include "p_local.h"
|
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
#include "r_plane.h"
|
#include "r_plane.h"
|
||||||
#include "r_bsp.h"
|
#include "r_bsp.h"
|
||||||
|
@ -861,7 +860,6 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
|
||||||
}
|
}
|
||||||
WallMirrors.Clear ();
|
WallMirrors.Clear ();
|
||||||
interpolator.RestoreInterpolations ();
|
interpolator.RestoreInterpolations ();
|
||||||
P_UnPredictPlayer();
|
|
||||||
R_SetupBuffer ();
|
R_SetupBuffer ();
|
||||||
|
|
||||||
// If we don't want shadered colormaps, NULL it now so that the
|
// If we don't want shadered colormaps, NULL it now so that the
|
||||||
|
|
|
@ -744,10 +744,6 @@ void R_SetupFrame (AActor *actor)
|
||||||
{
|
{
|
||||||
camera = player->camera = player->mo;
|
camera = player->camera = player->mo;
|
||||||
}
|
}
|
||||||
if (camera == actor)
|
|
||||||
{
|
|
||||||
P_PredictPlayer (player);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue