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

Rebase whoopsies fixups

Browse source
This commit is contained in:
Ashnal 2025-06-07 18:03:56 -04:00
parent 590227a135
commit f7c9f5dfaf
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/k_kart.c
View file

@ -10009,6 +10009,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
// Extra tripwire leniency for the end of invincibility // Extra tripwire leniency for the end of invincibility
if (player->invincibilitytimer <= 0) { if (player->invincibilitytimer <= 0) {
player->tripwireLeniency = max( player->tripwireLeniency, TICRATE ); player->tripwireLeniency = max( player->tripwireLeniency, TICRATE );
}
} }
if (player->baildrop) if (player->baildrop)

4
src/k_menufunc.c
View file

@ -465,8 +465,8 @@ boolean M_Responder(event_t *ev)
// Special mid-game input behaviours // Special mid-game input behaviours
if (Playing() && !demo.playback) if (Playing() && !demo.playback)
{ {
// Quick Retry (Y in modeattacking) // Quick Retry (Z in modeattacking)
if (modeattacking && G_PlayerInputDown(0, gc_bail, splitscreen + 1) == true) if (modeattacking && G_PlayerInputDown(0, gc_vote, splitscreen + 1) == true)
{ {
M_TryAgain(0); M_TryAgain(0);
return true; return true;

2
src/p_setup.cpp
View file

@ -8698,7 +8698,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
if (G_IsModeAttackRetrying() && !demo.playback) if (G_IsModeAttackRetrying() && !demo.playback)
{ {
nowtime = lastwipetic; nowtime = lastwipetic;
while (G_PlayerInputDown(0, gc_respawn, splitscreen + 1) == true) while (G_PlayerInputDown(0, gc_vote, splitscreen + 1) == true)
{ {
while (!((nowtime = I_GetTime()) - lastwipetic)) while (!((nowtime = I_GetTime()) - lastwipetic))
{ {