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

Merge branch 'chatclosefix' into 'master'

Browse source 
Fix softlocks surrounding chat input changes

Closes #373

See merge request kart-krew-dev/ring-racers!70
This commit is contained in:
Eidolon 2025-10-25 19:06:27 -05:00
commit 4c2e540451
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_menufunc.c
View file

@ -1098,7 +1098,7 @@ void M_UpdateMenuCMD(UINT8 i, boolean bailrequired, boolean chat_open)
menucmd[i].buttons = 0;
// Eat inputs made when chat is open
if (chat_open)
if (chat_open && pausemenu.closing)
return;
if (G_PlayerInputDown(i, gc_screenshot, mp)) { menucmd[i].buttons |= MBT_SCREENSHOT; }

4
src/menus/transient/pause-game.c
View file

@ -15,6 +15,7 @@
#include "../../d_netcmd.h"
#include "../../i_time.h"
#include "../../k_menu.h"
#include "../../hu_stuff.h"
#include "../../k_grandprix.h" // K_CanChangeRules
#include "../../m_cond.h"
#include "../../s_sound.h"
@ -125,6 +126,9 @@ void M_OpenPauseMenu(void)
pausemenu.openoffset.dist = 0;
pausemenu.closing = false;
// Fix specific input error regarding closing netgame chat with escape while a controller is connected (only on Windows?)
chat_keydown = false;
itemOn = currentMenu->lastOn = mpause_continue; // Make sure we select "RESUME GAME" by default
// Now the hilarious balancing act of deciding what options should be enabled and which ones shouldn't be!