From 5cc8734da7466492ffd609934ce963145f362e75 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Sun, 17 Sep 2017 21:37:36 -0400 Subject: [PATCH] Prevent bots from killing bubbles Self-explanatory. They can still breathe them in, they just no longer get popped --- src/p_inter.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index d2101ca57..316d2f43a 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1593,7 +1593,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) return; // Only go in the mouth // Eaten by player! - if (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1) + if ((!player->bot) && (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1)) P_RestoreMusic(player); if (player->powers[pw_underwater] < underwatertics + 1) @@ -1606,7 +1606,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } toucher->momx = toucher->momy = toucher->momz = 0; - break; + + if (player->bot) + return; + else + break; case MT_WATERDROP: if (special->state == &states[special->info->spawnstate])