OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/r_defs.h
This commit is contained in:
Christoph Oelckers 2016-04-24 12:19:07 +02:00
commit 2914cdc939
40 changed files with 208 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/r_data/r_interpolate.cpp
View file

@ -441,12 +441,12 @@ void DSectorPlaneInterpolation::UpdateInterpolation()
if (!ceiling)
{
oldheight = sector->floorplane.fD();
oldtexz = sector->GetPlaneTexZF(sector_t::floor);
oldtexz = sector->GetPlaneTexZ(sector_t::floor);
}
else
{
oldheight = sector->ceilingplane.fD();
oldtexz = sector->GetPlaneTexZF(sector_t::ceiling);
oldtexz = sector->GetPlaneTexZ(sector_t::ceiling);
}
}
@ -495,7 +495,7 @@ void DSectorPlaneInterpolation::Interpolate(double smoothratio)
}
bakheight = pplane->fD();
baktexz = sector->GetPlaneTexZF(pos);
baktexz = sector->GetPlaneTexZ(pos);
if (refcount == 0 && oldheight == bakheight)
{