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

Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters.

Browse source
This commit is contained in:
toaster 2019-10-19 14:46:14 +01:00
parent a609fa0859
commit 00ba624cfa
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/p_map.c
View file

@ -152,7 +152,9 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (object->player) if (object->player)
{ {
if (object->player->charability == CA_TWINSPIN && object->player->panim == PA_ABILITY) if (spring->info->painchance == 3)
;
else if (object->player->charability == CA_TWINSPIN && object->player->panim == PA_ABILITY)
strong = 1; strong = 1;
else if (object->player->charability2 == CA2_MELEE && object->player->panim == PA_ABILITY2) else if (object->player->charability2 == CA2_MELEE && object->player->panim == PA_ABILITY2)
strong = 2; strong = 2;
@ -410,7 +412,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
object->player->pflags |= P_GetJumpFlags(object->player); object->player->pflags |= P_GetJumpFlags(object->player);
P_SetPlayerMobjState(object, S_PLAY_JUMP); P_SetPlayerMobjState(object, S_PLAY_JUMP);
} }
else if ((spring->info->painchance == 2) || (pflags & PF_BOUNCING)) // Adding momentum only. else if ((spring->info->painchance == 2) || ((spring->info->painchance != 3) && (pflags & PF_BOUNCING))) // Adding momentum only.
{ {
object->player->pflags |= (pflags &~ PF_STARTJUMP); object->player->pflags |= (pflags &~ PF_STARTJUMP);
object->player->secondjump = secondjump; object->player->secondjump = secondjump;