OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "Merge pull request #359 from Leonard2/master"

Browse source 
This reverts commit 364ca11b43, reversing
changes made to dae0e217d1.

Conflicts:
	src/r_data/r_interpolate.cpp
This commit is contained in:
Christoph Oelckers 2015-09-18 17:41:16 +02:00
commit b613db4ae5
8 changed files with 4 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/p_pspr.cpp
View file

@ -1104,32 +1104,11 @@ void P_MovePsprites (player_t *player)
P_CheckWeaponZoom (player);
}
}
psp = &player->psprites[0];
for (i = 0; i < NUMPSPRITES; i++, psp++)
{
if (psp->state == NULL)
{
if (psp->interpolation != NULL)
{
player->pspinterp[i] = NULL;
psp->StopInterpolation();
}
}
else if (psp->interpolation == NULL)
{
player->pspinterp[i] = psp->SetInterpolation(player - players, i);
}
}
}
FArchive &operator<< (FArchive &arc, pspdef_t &def)
{
arc << def.state << def.tics << def.sx << def.sy
<< def.sprite << def.frame;
if (SaveVersion >= 4525)
arc << def.interpolation;
return arc;
}