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

Merge branch 'fix-menu-button-bleed' into 'master'

Browse source 
Fix menu and replay save dialog opening while chat is open

Closes #300

See merge request KartKrew/Kart!734
This commit is contained in:
Sal 2022-10-26 03:48:12 +00:00
commit 38e36d3e77
5 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/g_demo.c
View file

@ -3937,3 +3937,16 @@ boolean G_DemoTitleResponder(event_t *ev)
return true;
}
boolean G_CheckDemoTitleEntry(void)
{
if (menuactive || chat_on)
return false;
if (!G_PlayerInputDown(0, gc_b, 0) && !G_PlayerInputDown(0, gc_x, 0))
return false;
demo.savemode = DSM_TITLEENTRY;
return true;
}

2
src/g_demo.h
View file

@ -189,4 +189,6 @@ void G_SaveDemo(void);
boolean G_DemoTitleResponder(event_t *ev);
boolean G_CheckDemoTitleEntry(void);
#endif // __G_DEMO__

10
src/k_menufunc.c
View file

@ -885,17 +885,11 @@ boolean M_Responder(event_t *ev)
if (CON_Ready() == false && G_PlayerInputDown(0, gc_start, splitscreen + 1) == true)
{
if (chat_on)
{
HU_clearChatChars();
chat_on = false;
}
else
if (!chat_on)
{
M_StartControlPanel();
return true;
}
return true;
}
noFurtherInput = false; // turns out we didn't care

4
src/p_tick.c
View file

@ -729,8 +729,8 @@ void P_Ticker(boolean run)
G_WriteAllGhostTics();
if (cv_recordmultiplayerdemos.value && (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE))
if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && !menuactive && (G_PlayerInputDown(0, gc_b, 0) || G_PlayerInputDown(0, gc_x, 0)))
demo.savemode = DSM_TITLEENTRY;
if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime)
G_CheckDemoTitleEntry();
}
else if (demo.playback) // Use Ghost data for consistency checks.
{

4
src/y_inter.c
View file

@ -632,8 +632,8 @@ void Y_Ticker(void)
if (demo.recording)
{
if (demo.savemode == DSM_NOTSAVING && !menuactive && (G_PlayerInputDown(0, gc_b, 0) || G_PlayerInputDown(0, gc_x, 0)))
demo.savemode = DSM_TITLEENTRY;
if (demo.savemode == DSM_NOTSAVING)
G_CheckDemoTitleEntry();
if (demo.savemode == DSM_WILLSAVE || demo.savemode == DSM_WILLAUTOSAVE)
G_SaveDemo();