From 6b4d64bde543715b164f49667524047c9f74f8d0 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 16 Jul 2019 08:38:21 +0000
Subject: [PATCH] Tweak previous commit so clipmove takes precedence over
 getzrange

git-svn-id: https://svn.eduke32.com/eduke32@7795 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/actors.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp
index 9c89f2c34..3d5ddecfb 100644
--- a/source/duke3d/src/actors.cpp
+++ b/source/duke3d/src/actors.cpp
@@ -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;