Merge branch 'master' into zscript

# Conflicts:
#	src/p_actionfunctions.cpp
#	wadsrc/static/actors/actor.txt
This commit is contained in:
Christoph Oelckers 2016-11-02 11:08:51 +01:00
commit f940216c17
26 changed files with 532 additions and 81 deletions

View file

@ -262,8 +262,7 @@ void DPSprite::NewTick()
while (pspr)
{
pspr->processPending = true;
pspr->oldx = pspr->x;
pspr->oldy = pspr->y;
pspr->ResetInterpolation();
pspr = pspr->Next;
}