zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweak previous commit so clipmove takes precedence over getzrange

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7795 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-07-16 08:38:21 +00:00 committed by Christoph Oelckers
parent df609ccfbc
commit 6b4d64bde5
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/duke3d/src/actors.cpp
View file

@ -563,7 +563,10 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin
// Update sprite's z positions and (for TROR) maybe the sector number.
if (doZUpdate == 2)
returnValue = change->z < 0 ? ceilhit : florhit;
{
if (returnValue == 0)
returnValue = change->z < 0 ? ceilhit : florhit;
}
else if (doZUpdate)
{
pSprite->z = newZ;