stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shift around flashing bump stuff

Browse source
This commit is contained in:
Sally Cochenour 2019-01-30 15:57:46 -05:00
parent 9984f0e217
commit 34b027e8ba
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/k_kart.c
View file

@ -1068,19 +1068,24 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
|| (mobj2->player && mobj2->player->kartstuff[k_respawn]))
return;
// Don't bump if you're flashing
if (mobj1->player && mobj1->player->powers[pw_flashing] > 0
&& mobj1->player->powers[pw_flashing] < K_GetKartFlashing(mobj1->player)-1)
{
mobj1->player->powers[pw_flashing]++;
return;
}
{ // Don't bump if you're flashing
INT32 flash;
if (mobj2->player && mobj2->player->powers[pw_flashing] > 0
&& mobj2->player->powers[pw_flashing] < K_GetKartFlashing(mobj2->player)-1)
{
mobj2->player->powers[pw_flashing]++;
return;
flash = K_GetKartFlashing(mobj1->player);
if (mobj1->player && mobj1->player->powers[pw_flashing] > 0 && mobj1->player->powers[pw_flashing] < flash)
{
if (mobj1->player->powers[pw_flashing] < flash-1)
mobj1->player->powers[pw_flashing]++;
return;
}
flash = K_GetKartFlashing(mobj2->player);
if (mobj2->player && mobj2->player->powers[pw_flashing] > 0 && mobj2->player->powers[pw_flashing] < flash)
{
if (mobj2->player->powers[pw_flashing] < flash-1)
mobj2->player->powers[pw_flashing]++;
return;
}
}
// Don't bump if you've recently bumped