diff options
author | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
---|---|---|
committer | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
commit | 27b5915111ffbdae97ce0c415157e104ee6f3493 (patch) | |
tree | 850fc62208b642b07047e0a9ea968c365d4dfd1f /src/strife/p_inter.c | |
parent | 350ac122030d198b187255b19b2519ef8267364a (diff) | |
parent | ad027ef6dbfeebabe0e6701eec968e9d474e497f (diff) | |
download | chocolate-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_inter.c')
-rw-r--r-- | src/strife/p_inter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index 71db6fe1..f2e16efb 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -537,7 +537,7 @@ void P_TouchSpecialThing(mobj_t* special, mobj_t* toucher) // rifle case SPR_RIFL: - if(!P_GiveWeapon(player, wp_rifle, special->flags & MF_DROPPED)) + if(!P_GiveWeapon(player, wp_rifle, (special->flags & MF_DROPPED) != 0)) return; sound = sfx_wpnup; // haleyjd: SHK-CHK! break; @@ -560,7 +560,8 @@ void P_TouchSpecialThing(mobj_t* special, mobj_t* toucher) // grenade launcher case SPR_GRND: - if(!P_GiveWeapon(player, wp_hegrenade, special->flags & MF_DROPPED)) + if(!P_GiveWeapon(player, wp_hegrenade, + (special->flags & MF_DROPPED) != 0)) return; sound = sfx_wpnup; // haleyjd: SHK-CHK! break; @@ -574,14 +575,15 @@ void P_TouchSpecialThing(mobj_t* special, mobj_t* toucher) // electric bolt crossbow case SPR_CBOW: - if(!P_GiveWeapon(player, wp_elecbow, special->flags & MF_DROPPED)) + if(!P_GiveWeapon(player, wp_elecbow, + (special->flags & MF_DROPPED) != 0)) return; sound = sfx_wpnup; // haleyjd: SHK-CHK! break; // haleyjd 09/21/10: missed case: THE SIGIL! case SPR_SIGL: - if(!P_GiveWeapon(player, wp_sigil, special->flags & MF_DROPPED)) + if(!P_GiveWeapon(player, wp_sigil, (special->flags & MF_DROPPED) != 0)) { player->sigiltype = special->frame; return; |