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

Improve controls handling in connection screen minigame

Browse source
This commit is contained in:
Louis-Antoine 2020-01-01 00:18:17 +01:00
parent 0928375bc4
commit 151fe6be07
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/d_clisrv.c
View file

@ -1215,24 +1215,25 @@ static void CL_HandleSnake(INT32 key)
snake->time++; snake->time++;
// Update direction // Update direction
switch (key) if (gamekeydown[KEY_LEFTARROW])
{ {
case KEY_LEFTARROW: if (snake->snakeprevdir != 2)
if (snake->snakeprevdir != 2) snake->snakedir = 1;
snake->snakedir = 1; }
break; else if (gamekeydown[KEY_RIGHTARROW])
case KEY_RIGHTARROW: {
if (snake->snakeprevdir != 1) if (snake->snakeprevdir != 1)
snake->snakedir = 2; snake->snakedir = 2;
break; }
case KEY_UPARROW: else if (gamekeydown[KEY_UPARROW])
if (snake->snakeprevdir != 4) {
snake->snakedir = 3; if (snake->snakeprevdir != 4)
break; snake->snakedir = 3;
case KEY_DOWNARROW: }
if (snake->snakeprevdir != 3) else if (gamekeydown[KEY_DOWNARROW])
snake->snakedir = 4; {
break; if (snake->snakeprevdir != 3)
snake->snakedir = 4;
} }
snake->nextupdate--; snake->nextupdate--;
@ -2281,11 +2282,11 @@ static boolean CL_ServerConnectionTicker(boolean viams, const char *tmpsave, tic
// Call it only once by tic // Call it only once by tic
if (*oldtic != I_GetTime()) if (*oldtic != I_GetTime())
{ {
INT32 key;
I_OsPolling(); I_OsPolling();
key = I_GetKey(); for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
if (key == KEY_ESCAPE || key == KEY_JOY1+1) G_MapEventsToControls(&events[eventtail]);
if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1])
{ {
CONS_Printf(M_GetText("Network game synchronization aborted.\n")); CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
// M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING); // M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING);
@ -2299,6 +2300,7 @@ static boolean CL_ServerConnectionTicker(boolean viams, const char *tmpsave, tic
D_QuitNetGame(); D_QuitNetGame();
CL_Reset(); CL_Reset();
D_StartTitle(); D_StartTitle();
memset(gamekeydown, 0, NUMKEYS);
return false; return false;
} }
else if (cl_mode == CL_DOWNLOADFILES && snake) else if (cl_mode == CL_DOWNLOADFILES && snake)