OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-23 13:40:19 +02:00
commit bf36900299
5 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/r_data/r_interpolate.cpp
View file

@ -604,8 +604,8 @@ void DSectorScrollInterpolation::Destroy()
void DSectorScrollInterpolation::UpdateInterpolation()
{
oldx = sector->GetXOffsetF(ceiling);
oldy = sector->GetYOffsetF(ceiling, false);
oldx = sector->GetXOffset(ceiling);
oldy = sector->GetYOffset(ceiling, false);
}
//==========================================================================
@ -628,8 +628,8 @@ void DSectorScrollInterpolation::Restore()
void DSectorScrollInterpolation::Interpolate(double smoothratio)
{
bakx = sector->GetXOffsetF(ceiling);
baky = sector->GetYOffsetF(ceiling, false);
bakx = sector->GetXOffset(ceiling);
baky = sector->GetYOffset(ceiling, false);
if (refcount == 0 && oldx == bakx && oldy == baky)
{