diff options
author | Simon Howard | 2015-02-20 00:03:15 -0500 |
---|---|---|
committer | Simon Howard | 2015-02-20 00:03:15 -0500 |
commit | 1f5ce047ad6cb709f746b794b4a2dea9e2f89fb6 (patch) | |
tree | 273878bb2a6288122a4efd4f012dbbd611f82500 /src/heretic | |
parent | 714d7a29397b44fcb2b1fef2d675d296cb984264 (diff) | |
download | chocolate-doom-1f5ce047ad6cb709f746b794b4a2dea9e2f89fb6.tar.gz chocolate-doom-1f5ce047ad6cb709f746b794b4a2dea9e2f89fb6.tar.bz2 chocolate-doom-1f5ce047ad6cb709f746b794b4a2dea9e2f89fb6.zip |
Fix game code that makes false boolean assumptions.
Various bits of code assume that booleans are represented as 32-bit
ints and that they can be assigned to from 32-bit values. This isn't
true on all systems; fix code that does this to convert to boolean
values properly.
This is more progress towards fixing #509.
Diffstat (limited to 'src/heretic')
-rw-r--r-- | src/heretic/p_map.c | 2 | ||||
-rw-r--r-- | src/heretic/p_maputl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/heretic/p_map.c b/src/heretic/p_map.c index 48db07e5..6f1e64d7 100644 --- a/src/heretic/p_map.c +++ b/src/heretic/p_map.c @@ -428,7 +428,7 @@ boolean PIT_CheckThing(mobj_t * thing) // Check for special thing if (thing->flags & MF_SPECIAL) { - solid = thing->flags & MF_SOLID; + solid = (thing->flags & MF_SOLID) != 0; if (tmflags & MF_PICKUP) { // Can be picked up by tmthing P_TouchSpecialThing(thing, tmthing); // Can remove thing diff --git a/src/heretic/p_maputl.c b/src/heretic/p_maputl.c index 577f527c..e2a71556 100644 --- a/src/heretic/p_maputl.c +++ b/src/heretic/p_maputl.c @@ -667,7 +667,7 @@ boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, int mapx, mapy, mapxstep, mapystep; int count; - earlyout = flags & PT_EARLYOUT; + earlyout = (flags & PT_EARLYOUT) != 0; validcount++; intercept_p = intercepts; |