diff --git a/src/hu_stuff.c b/src/hu_stuff.c index e63fceffb..53f3666a0 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2583,50 +2583,22 @@ void HU_drawPing(INT32 x, INT32 y, UINT32 lag, INT32 flags) gfxnum = Ping_gfx_num(lag); if (measureid == 1) - { - if (cv_ticrate.value == 2){ - V_DrawScaledPatch(x+12 - pingmeasure[measureid]->width, y+22, flags, pingmeasure[measureid]); - }else{ - V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); - } - } - + V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); if (cv_pingicon.value) - { - if (cv_ticrate.value == 2){ - V_DrawScaledPatch(x+2, y+13, flags, pinggfx[gfxnum]); - }else{ - V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]); - } - } - + V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]); if (servermaxping && lag > servermaxping && hu_tick < 4) - { - // flash ping red if too high - colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE); - } + colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE); // flash ping red if too high if (cv_pingmeasurement.value) - { lag = (INT32)(lag * (1000.00f / TICRATE)); - } - - if (cv_ticrate.value == 2){ - x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+22, flags, lag, colormap); - }else{ - x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, lag, colormap); - } - if (measureid == 0){ - if (cv_ticrate.value == 2){ - V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+22, flags, pingmeasure[measureid]); - }else{ + x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, lag, colormap); + + + if (measureid == 0) V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); - } - } - } // diff --git a/src/screen.c b/src/screen.c index ee0c76e82..bc787e4b2 100644 --- a/src/screen.c +++ b/src/screen.c @@ -476,7 +476,8 @@ void SCR_DisplayLocalPing(void) if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level { - INT32 dispy = cv_ticrate.value ? 160 : 181; - HU_drawPing(307, dispy, ping, fpsflags); + INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2) ? 172 : 181); + + HU_drawPing(308, dispy, ping, fpsflags); } }