thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ta-comms' into 'master'

Browse source 
Remap TA retry from Z (dialogue) back to Y (bail)

See merge request kart-krew-dev/ring-racers-internal!2815
This commit is contained in:
Oni VelocitOni 2025-09-14 22:03:38 +00:00
commit b46ae2ffca
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_dialogue.cpp
View file

@ -295,7 +295,7 @@ void Dialogue::Tick(void)
slide += kSlideSpeed; slide += kSlideSpeed;
} }
if (P_LevelIsFrozen()) if (P_LevelIsFrozen() || (gametyperules & GTR_BOSS))
{ {
if (fade > 0) if (fade > 0)
{ {

2
src/k_hud.cpp
View file

@ -7985,7 +7985,7 @@ void K_drawKartHUD(void)
if (ta) if (ta)
{ {
using srb2::Draw; using srb2::Draw;
Draw::TextElement text = Draw::TextElement().parse("<z> Restart"); Draw::TextElement text = Draw::TextElement().parse("<y> Restart");
Draw(BASEVIDWIDTH - 19, 2) Draw(BASEVIDWIDTH - 19, 2)
.flags(flags | V_ORANGEMAP) .flags(flags | V_ORANGEMAP)
.align(Draw::Align::kRight) .align(Draw::Align::kRight)

4
src/k_menufunc.c
View file

@ -468,8 +468,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 (Z in modeattacking) // Quick Retry (Y in modeattacking)
if (modeattacking && G_PlayerInputDown(0, gc_vote, splitscreen + 1) == true) if (modeattacking && G_PlayerInputDown(0, gc_bail, splitscreen + 1) == true)
{ {
if (!blockreset) if (!blockreset)
{ {

2
src/p_setup.cpp
View file

@ -8742,7 +8742,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_vote, splitscreen + 1) == true) while (G_PlayerInputDown(0, gc_bail, splitscreen + 1) == true)
{ {
while (!((nowtime = I_GetTime()) - lastwipetic)) while (!((nowtime = I_GetTime()) - lastwipetic))
{ {