TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Only death-spew armed proximity bombs in multiplayer

Browse source 
Commit 829e95b6 meant to remove the restriction that the game not be
hoard mode, but incorrectly also removed the restriction that the game
be multiplayer.  Restore the multiplayer restriction.

Reported-by: zicodxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/433>
Fixes: 829e95b6f8 ("Separate hoard/proximity tracking")
This commit is contained in:
Kp 2019-07-12 02:01:53 +00:00
parent f84cdff6a2
commit 7bd861e374
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
similar/main/collide.cpp
View file

@ -1956,7 +1956,8 @@ void drop_player_eggs(const vmobjptridx_t playerobj)
drop_armed_bomb(secondary_ammo[SMART_MINE_INDEX], weapon_id_type::SUPERPROX_ID);
// If the player had proximity bombs, maybe arm one of them.
drop_armed_bomb(secondary_ammo[PROXIMITY_INDEX], weapon_id_type::PROXIMITY_ID);
if (Game_mode & GM_MULTI)
drop_armed_bomb(secondary_ammo[PROXIMITY_INDEX], weapon_id_type::PROXIMITY_ID);
#endif
// If the player dies and he has powerful lasers, create the powerups here.