Move ping display in i_video for consistency with showfps display
This commit is contained in:
parent
a119d1cddd
commit
24516cbf84
|
@ -41,6 +41,7 @@
|
||||||
#include "../m_argv.h"
|
#include "../m_argv.h"
|
||||||
#include "vid_vesa.h"
|
#include "vid_vesa.h"
|
||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
|
#include "../hu_stuff.h"
|
||||||
|
|
||||||
|
|
||||||
//dosstuff -newly added
|
//dosstuff -newly added
|
||||||
|
@ -94,6 +95,10 @@ void I_FinishUpdate (void)
|
||||||
if (cv_ticrate.value)
|
if (cv_ticrate.value)
|
||||||
SCR_DisplayTicRate();
|
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
|
//blast it to the screen
|
||||||
// this code sucks
|
// this code sucks
|
||||||
//memcpy(dascreen,screens[0],screenwidth*screenheight);
|
//memcpy(dascreen,screens[0],screenwidth*screenheight);
|
||||||
|
|
|
@ -2329,7 +2329,8 @@ void HU_Drawer(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw the ping if the user wishes to
|
// draw the ping if the user wishes to
|
||||||
HU_drawLocalPing();
|
// THIS IS NOW HANDLED IN I_VIDEO
|
||||||
|
//HU_drawLocalPing();
|
||||||
}
|
}
|
||||||
|
|
||||||
//======================================================================
|
//======================================================================
|
||||||
|
|
|
@ -64,9 +64,10 @@
|
||||||
#include "../m_menu.h"
|
#include "../m_menu.h"
|
||||||
#include "../d_main.h"
|
#include "../d_main.h"
|
||||||
#include "../s_sound.h"
|
#include "../s_sound.h"
|
||||||
#include "../i_sound.h" // midi pause/unpause
|
#include "../i_sound.h" // midi pause/unpause
|
||||||
#include "../i_joy.h"
|
#include "../i_joy.h"
|
||||||
#include "../st_stuff.h"
|
#include "../st_stuff.h"
|
||||||
|
#include "../hu_stuff.h" // ping drawer
|
||||||
#include "../g_game.h"
|
#include "../g_game.h"
|
||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
#include "../console.h"
|
#include "../console.h"
|
||||||
|
@ -1361,6 +1362,10 @@ void I_FinishUpdate(void)
|
||||||
if (cv_ticrate.value)
|
if (cv_ticrate.value)
|
||||||
SCR_DisplayTicRate();
|
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])
|
if (rendermode == render_soft && screens[0])
|
||||||
{
|
{
|
||||||
SDL_Rect rect;
|
SDL_Rect rect;
|
||||||
|
|
|
@ -99,6 +99,7 @@
|
||||||
#include "../i_sound.h" // midi pause/unpause
|
#include "../i_sound.h" // midi pause/unpause
|
||||||
#include "../i_joy.h"
|
#include "../i_joy.h"
|
||||||
#include "../st_stuff.h"
|
#include "../st_stuff.h"
|
||||||
|
#include "../hu_stuff.h"
|
||||||
#include "../g_game.h"
|
#include "../g_game.h"
|
||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
#include "../console.h"
|
#include "../console.h"
|
||||||
|
@ -1343,6 +1344,10 @@ void I_FinishUpdate(void)
|
||||||
if (cv_ticrate.value)
|
if (cv_ticrate.value)
|
||||||
SCR_DisplayTicRate();
|
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])
|
if (render_soft == rendermode && screens[0])
|
||||||
{
|
{
|
||||||
SDL_Rect *dstrect = NULL;
|
SDL_Rect *dstrect = NULL;
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include "../m_argv.h"
|
#include "../m_argv.h"
|
||||||
#include "../v_video.h"
|
#include "../v_video.h"
|
||||||
#include "../st_stuff.h"
|
#include "../st_stuff.h"
|
||||||
|
#include "../hu_stuff.h"
|
||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
#include "../z_zone.h"
|
#include "../z_zone.h"
|
||||||
#include "fabdxlib.h"
|
#include "fabdxlib.h"
|
||||||
|
@ -366,6 +367,10 @@ void I_FinishUpdate(void)
|
||||||
if (cv_ticrate.value)
|
if (cv_ticrate.value)
|
||||||
SCR_DisplayTicRate();
|
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)
|
if (bDIBMode)
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "../m_argv.h"
|
#include "../m_argv.h"
|
||||||
#include "../v_video.h"
|
#include "../v_video.h"
|
||||||
#include "../st_stuff.h"
|
#include "../st_stuff.h"
|
||||||
|
#include "../hu_stuff.h"
|
||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
#include "../z_zone.h"
|
#include "../z_zone.h"
|
||||||
#include "fabdxlib.h"
|
#include "fabdxlib.h"
|
||||||
|
@ -198,6 +199,10 @@ void I_FinishUpdate(void)
|
||||||
if (cv_ticrate.value)
|
if (cv_ticrate.value)
|
||||||
SCR_DisplayTicRate();
|
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)
|
if (bDIBMode)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue