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

Merge sdl/i_video.c

Browse source
This commit is contained in:
SteelT 2020-08-10 13:03:41 -04:00
parent 428ac51c68
commit fd000248b7
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sdl/i_video.c
View file

@ -360,10 +360,6 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
case SDL_SCANCODE_RGUI: return KEY_RIGHTWIN;
default: break;
}
<<<<<<< HEAD
=======
>>>>>>> srb2/next
return 0;
}
@ -1422,7 +1418,6 @@ void I_FinishUpdate(void)
if (I_SkipFrame())
return;
<<<<<<< HEAD
if (st_overlay)
{
if (cv_ticrate.value)
@ -1434,10 +1429,9 @@ void I_FinishUpdate(void)
SCR_DisplayLocalPing();
}
}
=======
if (marathonmode)
SCR_DisplayMarathonInfo();
>>>>>>> srb2/next
// draw captions if enabled
if (cv_closedcaptioning.value)