stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-26 04:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent bots from killing bubbles

Browse source 
Self-explanatory. They can still breathe them in, they just no longer
get popped
This commit is contained in:
TehRealSalt 2017-09-17 21:37:36 -04:00
parent 8b53295a74
commit 5cc8734da7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_inter.c
View file

@ -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])