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

K_DropPowerUps: remove invincibilitytimer along with "S"

Browse source
This commit is contained in:
James R 2023-06-30 00:48:39 -07:00
parent 5d4ec59a33
commit e03e1aff0c
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_powerup.cpp
View file

@ -1,5 +1,7 @@
/// \brief Battle mode power-up code /// \brief Battle mode power-up code
#include <algorithm>
#include "k_kart.h" #include "k_kart.h"
#include "k_objects.h" #include "k_objects.h"
#include "k_powerup.h" #include "k_powerup.h"
@ -95,7 +97,15 @@ void K_DropPowerUps(player_t* player)
auto& powerup = player->powerup; auto& powerup = player->powerup;
drop(POWERUP_SMONITOR, [&] { powerup.superTimer = 0; }); drop(
POWERUP_SMONITOR, [&]
{
// P_CheckInvincibilityTimer needs 1 tic to end the music
player->invincibilitytimer -= std::min(+powerup.superTimer, player->invincibilitytimer - 1);
powerup.superTimer = 0;
}
);
drop(POWERUP_BARRIER, [&] { powerup.barrierTimer = 0; }); drop(POWERUP_BARRIER, [&] { powerup.barrierTimer = 0; });
drop(POWERUP_BADGE, [&] { powerup.rhythmBadgeTimer = 0; }); drop(POWERUP_BADGE, [&] { powerup.rhythmBadgeTimer = 0; });
drop(POWERUP_SUPERFLICKY, [&] { Obj_EndSuperFlickySwarm(powerup.flickyController); }); drop(POWERUP_SUPERFLICKY, [&] { Obj_EndSuperFlickySwarm(powerup.flickyController); });