OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
Conflicts:
	wadsrc/static/compatibility.txt
This commit is contained in:
Christoph Oelckers 2015-09-19 12:32:22 +02:00
commit 4e1723eeb7
20 changed files with 130 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_saveg.cpp
View file

@ -297,11 +297,6 @@ static void CopyPlayer (player_t *dst, player_t *src, const char *name)
{
dst->mo->player = dst;
}
// Fix the psprite interpolation pointers too.
for (int i = 0; i < NUMPSPRITES; i++)
{
dst->psprites[i].UpdateInterpolation(dst - players);
}
// These 2 variables may not be overwritten.
dst->attackdown = attackdown;
dst->usedown = usedown;