Merge branch 'master' of c:\programming\doom-dev\zdoom

This commit is contained in:
Christoph Oelckers 2016-04-23 11:29:27 +02:00
commit 47834907da
8 changed files with 51 additions and 51 deletions

View file

@ -695,8 +695,8 @@ void DWallScrollInterpolation::Destroy()
void DWallScrollInterpolation::UpdateInterpolation()
{
oldx = side->GetTextureXOffsetF(part);
oldy = side->GetTextureYOffsetF(part);
oldx = side->GetTextureXOffset(part);
oldy = side->GetTextureYOffset(part);
}
//==========================================================================
@ -719,8 +719,8 @@ void DWallScrollInterpolation::Restore()
void DWallScrollInterpolation::Interpolate(double smoothratio)
{
bakx = side->GetTextureXOffsetF(part);
baky = side->GetTextureYOffsetF(part);
bakx = side->GetTextureXOffset(part);
baky = side->GetTextureYOffset(part);
if (refcount == 0 && oldx == bakx && oldy == baky)
{