From edf7efbea35087a6f56ed71ed6f5db613386d39d Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 28 Sep 2010 18:51:07 +0000
Subject: Fix compile warnings.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2149
---
 src/strife/p_map.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/strife/p_map.c')

diff --git a/src/strife/p_map.c b/src/strife/p_map.c
index 44f12689..99ae3d40 100644
--- a/src/strife/p_map.c
+++ b/src/strife/p_map.c
@@ -544,8 +544,9 @@ P_TryMove
             return false;	// mobj must lower itself to fit
 
         // villsa [STRIFE] non-robots are limited to 16 unit step height
-        if(!(thing->flags & MF_NOBLOOD) && tmfloorz - thing->z > (16*FRACUNIT) ||
-            tmfloorz - thing->z > 24*FRACUNIT)
+        if ((thing->flags & MF_NOBLOOD) == 0 && tmfloorz - thing->z > (16*FRACUNIT))
+            return false;
+        if (tmfloorz - thing->z > 24*FRACUNIT)
             return false;       // too big a step up
 
         // villsa [STRIFE] special case for missiles
-- 
cgit v1.2.3