summaryrefslogtreecommitdiff
path: root/src/strife/p_map.c
diff options
context:
space:
mode:
authorSimon Howard2010-09-28 18:51:07 +0000
committerSimon Howard2010-09-28 18:51:07 +0000
commitedf7efbea35087a6f56ed71ed6f5db613386d39d (patch)
tree39c0e0dca58bae3a518ea7b5463ce78741f00985 /src/strife/p_map.c
parentaf6ee1723e009ff55e42fd257da03712ba7099f1 (diff)
downloadchocolate-doom-edf7efbea35087a6f56ed71ed6f5db613386d39d.tar.gz
chocolate-doom-edf7efbea35087a6f56ed71ed6f5db613386d39d.tar.bz2
chocolate-doom-edf7efbea35087a6f56ed71ed6f5db613386d39d.zip
Fix compile warnings.
Subversion-branch: /branches/strife-branch Subversion-revision: 2149
Diffstat (limited to 'src/strife/p_map.c')
-rw-r--r--src/strife/p_map.c5
1 files changed, 3 insertions, 2 deletions
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