lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Re-order Marathon bar to be drawn before FPS and captions if applicable.

Browse source
This commit is contained in:
toaster 2020-05-15 13:39:27 +01:00
parent 4348ebdfa8
commit 271c6d354b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/djgppdos/i_video.c
View file

@ -90,6 +90,9 @@ static unsigned long nombre = NEWTICRATE*10;
static void I_BlitScreenVesa1(void); //see later static void I_BlitScreenVesa1(void); //see later
void I_FinishUpdate (void) void I_FinishUpdate (void)
{ {
if (marathonmode)
SCR_DisplayMarathonInfo();
// draw captions if enabled // draw captions if enabled
if (cv_closedcaptioning.value) if (cv_closedcaptioning.value)
SCR_ClosedCaptions(); SCR_ClosedCaptions();
@ -101,9 +104,6 @@ void I_FinishUpdate (void)
if (cv_showping.value && netgame && consoleplayer != serverplayer) if (cv_showping.value && netgame && consoleplayer != serverplayer)
SCR_DisplayLocalPing(); SCR_DisplayLocalPing();
if (marathonmode)
SCR_DisplayMarathonInfo();
//blast it to the screen //blast it to the screen
// this code sucks // this code sucks
//memcpy(dascreen,screens[0],screenwidth*screenheight); //memcpy(dascreen,screens[0],screenwidth*screenheight);

6
src/sdl/i_video.c
View file

@ -1203,6 +1203,9 @@ void I_FinishUpdate(void)
if (I_SkipFrame()) if (I_SkipFrame())
return; return;
if (marathonmode)
SCR_DisplayMarathonInfo();
// draw captions if enabled // draw captions if enabled
if (cv_closedcaptioning.value) if (cv_closedcaptioning.value)
SCR_ClosedCaptions(); SCR_ClosedCaptions();
@ -1213,9 +1216,6 @@ void I_FinishUpdate(void)
if (cv_showping.value && netgame && consoleplayer != serverplayer) if (cv_showping.value && netgame && consoleplayer != serverplayer)
SCR_DisplayLocalPing(); SCR_DisplayLocalPing();
if (marathonmode)
SCR_DisplayMarathonInfo();
if (rendermode == render_soft && screens[0]) if (rendermode == render_soft && screens[0])
{ {
SDL_Rect rect; SDL_Rect rect;

6
src/win32/win_vid.c
View file

@ -366,6 +366,9 @@ void I_FinishUpdate(void)
if (I_SkipFrame()) if (I_SkipFrame())
return; return;
if (marathonmode)
SCR_DisplayMarathonInfo();
// draw captions if enabled // draw captions if enabled
if (cv_closedcaptioning.value) if (cv_closedcaptioning.value)
SCR_ClosedCaptions(); SCR_ClosedCaptions();
@ -377,9 +380,6 @@ void I_FinishUpdate(void)
if (cv_showping.value && netgame && consoleplayer != serverplayer) if (cv_showping.value && netgame && consoleplayer != serverplayer)
SCR_DisplayLocalPing(); SCR_DisplayLocalPing();
if (marathonmode)
SCR_DisplayMarathonInfo();
// //
if (bDIBMode) if (bDIBMode)
{ {