From af7e7bc18c7558c182f7beb67bc904d7ecf3c7be Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 15 May 2020 13:39:27 +0100 Subject: [PATCH] Re-order Marathon bar to be drawn before FPS and captions if applicable. --- src/djgppdos/i_video.c | 6 +++--- src/sdl/i_video.c | 6 +++--- src/win32/win_vid.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/djgppdos/i_video.c b/src/djgppdos/i_video.c index b3363a14e..d2483e318 100644 --- a/src/djgppdos/i_video.c +++ b/src/djgppdos/i_video.c @@ -90,6 +90,9 @@ static unsigned long nombre = NEWTICRATE*10; static void I_BlitScreenVesa1(void); //see later void I_FinishUpdate (void) { + if (marathonmode) + SCR_DisplayMarathonInfo(); + // draw captions if enabled if (cv_closedcaptioning.value) SCR_ClosedCaptions(); @@ -101,9 +104,6 @@ void I_FinishUpdate (void) if (cv_showping.value && netgame && consoleplayer != serverplayer) SCR_DisplayLocalPing(); - if (marathonmode) - SCR_DisplayMarathonInfo(); - //blast it to the screen // this code sucks //memcpy(dascreen,screens[0],screenwidth*screenheight); diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index e8fe020f0..b591bc4df 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -1203,6 +1203,9 @@ void I_FinishUpdate(void) if (I_SkipFrame()) return; + if (marathonmode) + SCR_DisplayMarathonInfo(); + // draw captions if enabled if (cv_closedcaptioning.value) SCR_ClosedCaptions(); @@ -1213,9 +1216,6 @@ void I_FinishUpdate(void) if (cv_showping.value && netgame && consoleplayer != serverplayer) SCR_DisplayLocalPing(); - if (marathonmode) - SCR_DisplayMarathonInfo(); - if (rendermode == render_soft && screens[0]) { SDL_Rect rect; diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c index eccec10bc..0f1144a84 100644 --- a/src/win32/win_vid.c +++ b/src/win32/win_vid.c @@ -366,6 +366,9 @@ void I_FinishUpdate(void) if (I_SkipFrame()) return; + if (marathonmode) + SCR_DisplayMarathonInfo(); + // draw captions if enabled if (cv_closedcaptioning.value) SCR_ClosedCaptions(); @@ -377,9 +380,6 @@ void I_FinishUpdate(void) if (cv_showping.value && netgame && consoleplayer != serverplayer) SCR_DisplayLocalPing(); - if (marathonmode) - SCR_DisplayMarathonInfo(); - // if (bDIBMode) {