summaryrefslogtreecommitdiff
path: root/src/strife/p_map.c
diff options
context:
space:
mode:
authorFabian Greffrath2015-03-26 16:31:57 +0100
committerFabian Greffrath2015-03-26 16:31:57 +0100
commit27b5915111ffbdae97ce0c415157e104ee6f3493 (patch)
tree850fc62208b642b07047e0a9ea968c365d4dfd1f /src/strife/p_map.c
parent350ac122030d198b187255b19b2519ef8267364a (diff)
parentad027ef6dbfeebabe0e6701eec968e9d474e497f (diff)
downloadchocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.gz
chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.bz2
chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.zip
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
Diffstat (limited to 'src/strife/p_map.c')
-rw-r--r--src/strife/p_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/strife/p_map.c b/src/strife/p_map.c
index 13a1bb54..03b57edd 100644
--- a/src/strife/p_map.c
+++ b/src/strife/p_map.c
@@ -384,7 +384,7 @@ boolean PIT_CheckThing (mobj_t* thing)
// check for special pickup
if (thing->flags & MF_SPECIAL)
{
- solid = thing->flags&MF_SOLID;
+ solid = (thing->flags & MF_SOLID) != 0;
if (tmthing->player) // villsa [STRIFE] no longer checks MF_PICKUP flag
{
// can remove thing