OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'multi' of https://github.com/Edward850/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-10-13 10:37:51 +02:00
commit 952d03da7c
9 changed files with 203 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.cpp
View file

@ -4250,6 +4250,12 @@ APlayerPawn *P_SpawnPlayer (FPlayerStart *mthing, int playernum, int flags)
if ((unsigned)playernum >= (unsigned)MAXPLAYERS || !playeringame[playernum])
return NULL;
// Old lerp data needs to go
if (playernum == consoleplayer)
{
P_PredictionLerpReset();
}
p = &players[playernum];
if (p->cls == NULL)