Move ping display in i_video for consistency with showfps display

This commit is contained in:
Latapostrophe 2019-02-16 13:38:50 +01:00
parent a119d1cddd
commit 24516cbf84
6 changed files with 28 additions and 2 deletions

View File

@ -41,6 +41,7 @@
#include "../m_argv.h"
#include "vid_vesa.h"
#include "../i_video.h"
#include "../hu_stuff.h"
//dosstuff -newly added
@ -93,6 +94,10 @@ void I_FinishUpdate (void)
// draw FPS if enabled
if (cv_ticrate.value)
SCR_DisplayTicRate();
// this is now handled here so that wipes and other things don't overlap it for the sake of consistency.
// no additional checks are needed here, this function does them all so no need to worry. :)
HU_drawLocalPing();
//blast it to the screen
// this code sucks

View File

@ -2329,7 +2329,8 @@ void HU_Drawer(void)
}
// draw the ping if the user wishes to
HU_drawLocalPing();
// THIS IS NOW HANDLED IN I_VIDEO
//HU_drawLocalPing();
}
//======================================================================

View File

@ -64,9 +64,10 @@
#include "../m_menu.h"
#include "../d_main.h"
#include "../s_sound.h"
#include "../i_sound.h" // midi pause/unpause
#include "../i_sound.h" // midi pause/unpause
#include "../i_joy.h"
#include "../st_stuff.h"
#include "../hu_stuff.h" // ping drawer
#include "../g_game.h"
#include "../i_video.h"
#include "../console.h"
@ -1360,6 +1361,10 @@ void I_FinishUpdate(void)
if (cv_ticrate.value)
SCR_DisplayTicRate();
// this is now handled here so that wipes and other things don't overlap it for the sake of consistency.
// no additional checks are needed here, this function does them all so no need to worry. :)
HU_drawLocalPing();
if (rendermode == render_soft && screens[0])
{

View File

@ -99,6 +99,7 @@
#include "../i_sound.h" // midi pause/unpause
#include "../i_joy.h"
#include "../st_stuff.h"
#include "../hu_stuff.h"
#include "../g_game.h"
#include "../i_video.h"
#include "../console.h"
@ -1342,6 +1343,10 @@ void I_FinishUpdate(void)
if (cv_ticrate.value)
SCR_DisplayTicRate();
// this is now handled here so that wipes and other things don't overlap it for the sake of consistency.
// no additional checks are needed here, this function does them all so no need to worry. :)
HU_drawLocalPing();
if (render_soft == rendermode && screens[0])
{

View File

@ -28,6 +28,7 @@
#include "../m_argv.h"
#include "../v_video.h"
#include "../st_stuff.h"
#include "../hu_stuff.h"
#include "../i_video.h"
#include "../z_zone.h"
#include "fabdxlib.h"
@ -365,6 +366,10 @@ void I_FinishUpdate(void)
// display a graph of ticrate
if (cv_ticrate.value)
SCR_DisplayTicRate();
// this is now handled here so that wipes and other things don't overlap it for the sake of consistency.
// no additional checks are needed here, this function does them all so no need to worry. :)
HU_drawLocalPing();
//
if (bDIBMode)

View File

@ -26,6 +26,7 @@
#include "../m_argv.h"
#include "../v_video.h"
#include "../st_stuff.h"
#include "../hu_stuff.h"
#include "../i_video.h"
#include "../z_zone.h"
#include "fabdxlib.h"
@ -198,6 +199,10 @@ void I_FinishUpdate(void)
if (cv_ticrate.value)
SCR_DisplayTicRate();
// this is now handled here so that wipes and other things don't overlap it for the sake of consistency.
// no additional checks are needed here, this function does them all so no need to worry. :)
HU_drawLocalPing();
//
if (bDIBMode)
{