Don't waste bubble if it doesn't collide
This commit is contained in:
parent
7849287441
commit
1e47df835a
1 changed files with 4 additions and 0 deletions
|
|
@ -791,6 +791,10 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
|
|||
|
||||
if (t2->type == MT_PLAYER)
|
||||
{
|
||||
if (P_PlayerInPain(t2->player)
|
||||
|| t2->player->flashing || t2->player->hyudorotimer
|
||||
|| t2->player->justbumped || t2->scale > t1->scale + (mapobjectscale/8))
|
||||
return true;
|
||||
// Player Damage
|
||||
if (K_KartBouncing(t2, t1->target, false, true))
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue