thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore bumping ring effects for shielded players

Browse source
This commit is contained in:
TehRealSalt 2019-05-22 13:54:32 -04:00
parent 414c2d4fb0
commit f615ff3b6b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_kart.c
View file

@ -1550,7 +1550,8 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
mobj1->player->kartstuff[k_spinouttimer] = max(wipeoutslowtime+1, mobj1->player->kartstuff[k_spinouttimer]); mobj1->player->kartstuff[k_spinouttimer] = max(wipeoutslowtime+1, mobj1->player->kartstuff[k_spinouttimer]);
//mobj1->player->kartstuff[k_spinouttype] = 1; // Enforce type //mobj1->player->kartstuff[k_spinouttype] = 1; // Enforce type
} }
else if (mobj2->player) // Player VS player bumping only else if (mobj2->player // Player VS player bumping only
&& (K_GetShieldFromItem(mobj1->player->kartstuff[k_itemtype]) == KITEM_NONE)) // Ignore for shields
{ {
if (mobj1->player->kartstuff[k_rings] <= 0) if (mobj1->player->kartstuff[k_rings] <= 0)
{ {
@ -1574,7 +1575,8 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
mobj2->player->kartstuff[k_spinouttimer] = max(wipeoutslowtime+1, mobj2->player->kartstuff[k_spinouttimer]); mobj2->player->kartstuff[k_spinouttimer] = max(wipeoutslowtime+1, mobj2->player->kartstuff[k_spinouttimer]);
//mobj2->player->kartstuff[k_spinouttype] = 1; // Enforce type //mobj2->player->kartstuff[k_spinouttype] = 1; // Enforce type
} }
else if (mobj1->player) // Player VS player bumping only else if (mobj1->player // Player VS player bumping only
&& (K_GetShieldFromItem(mobj2->player->kartstuff[k_itemtype]) == KITEM_NONE)) // Ignore for shields
{ {
if (mobj2->player->kartstuff[k_rings] <= 0) if (mobj2->player->kartstuff[k_rings] <= 0)
{ {