stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-25 11:50:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Sally Coolatta 2021-04-07 17:14:30 -04:00
commit a70faeccff
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -2468,7 +2468,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
key = I_GetKey();
// Only ESC and non-keyboard keys abort connection
if (key == KEY_ESCAPE || key >= KEY_MOUSE1 || cl_mode == CL_ABORTED)
if (!modeattacking && (key == KEY_ESCAPE || key >= KEY_MOUSE1 || cl_mode == CL_ABORTED))
{
CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
D_QuitNetGame();

7
src/st_stuff.c
View file

@ -232,7 +232,7 @@ void ST_doPaletteStuff(void)
{
st_palette = palette;
if (rendermode != render_none)
if (rendermode == render_soft)
{
//V_SetPaletteLump(GetPalette()); // Reset the palette -- is this needed?
if (!splitscreen)
@ -392,7 +392,10 @@ static inline void ST_Stop(void)
if (st_stopped)
return;
V_SetPalette(0);
#ifdef HWRENDER
if (rendermode != render_opengl)
#endif
V_SetPalette(0);
st_stopped = true;
}