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/doom/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/doom/p_inter.c')
| -rw-r--r-- | src/doom/p_inter.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/doom/p_inter.c b/src/doom/p_inter.c index c9965799..633408fe 100644 --- a/src/doom/p_inter.c +++ b/src/doom/p_inter.c @@ -603,8 +603,9 @@ P_TouchSpecialThing break; case SPR_MGUN: - if (!P_GiveWeapon (player, wp_chaingun, special->flags&MF_DROPPED) ) - return; + if (!P_GiveWeapon(player, wp_chaingun, + (special->flags & MF_DROPPED) != 0)) + return; player->message = DEH_String(GOTCHAINGUN); sound = sfx_wpnup; break; @@ -631,15 +632,17 @@ P_TouchSpecialThing break; case SPR_SHOT: - if (!P_GiveWeapon (player, wp_shotgun, special->flags&MF_DROPPED ) ) - return; + if (!P_GiveWeapon(player, wp_shotgun, + (special->flags & MF_DROPPED) != 0)) + return; player->message = DEH_String(GOTSHOTGUN); sound = sfx_wpnup; break; case SPR_SGN2: - if (!P_GiveWeapon (player, wp_supershotgun, special->flags&MF_DROPPED ) ) - return; + if (!P_GiveWeapon(player, wp_supershotgun, + (special->flags & MF_DROPPED) != 0)) + return; player->message = DEH_String(GOTSHOTGUN2); sound = sfx_wpnup; break; |