From 7bd861e3749369a8acc405b25f24ab80cfac1521 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 12 Jul 2019 02:01:53 +0000 Subject: [PATCH] Only death-spew armed proximity bombs in multiplayer 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 Fixes: 829e95b6f818f82c1f90502f8a3a7002479b3802 ("Separate hoard/proximity tracking") --- similar/main/collide.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/similar/main/collide.cpp b/similar/main/collide.cpp index 0197f7d05..1196bd11c 100644 --- a/similar/main/collide.cpp +++ b/similar/main/collide.cpp @@ -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.