From bccc79fe4bd38cf6323fe22eaf88cace4954fb5d Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 21 Dec 2023 12:06:31 +0100 Subject: [PATCH] Kart v1.0/srb2 ping display option well i adjusted it a little and made it compatible with the frame ping stuff just hope the bar stuff is right but seemed so also changed it so the numbers are right alignent so they dont go out of screen aaaa --- src/d_netcmd.c | 6 ++++ src/d_netcmd.h | 1 + src/hu_stuff.c | 90 +++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 85 insertions(+), 12 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 43d7377a7..b15b15526 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -484,6 +484,11 @@ consvar_t cv_showping = {"showping", "Always", CV_SAVE, showping_cons_t, NULL, 0 static CV_PossibleValue_t pingmeasurement_cons_t[] = {{0, "Frames"}, {1, "Milliseconds"}, {0, NULL}}; consvar_t cv_pingmeasurement = {"pingmeasurement", "Frames", CV_SAVE, pingmeasurement_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_pingicon = {"pingicon", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL}; + +static CV_PossibleValue_t cv_pingstyle_cons_t[] = {{0, "New"}, {1, "Old"}, {0, NULL}}; +consvar_t cv_pingstyle = {"pingstyle", "New", CV_SAVE, cv_pingstyle_cons_t, 0, 0, NULL, NULL, 0, 0, NULL}; + + consvar_t cv_luaimmersion = {"luaimmersion", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -795,6 +800,7 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_showping); CV_RegisterVar(&cv_pingmeasurement); CV_RegisterVar(&cv_pingicon); + CV_RegisterVar(&cv_pingstyle); #ifdef SEENAMES CV_RegisterVar(&cv_allowseenames); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 0f44840d8..8fbdf1d5f 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -156,6 +156,7 @@ extern consvar_t cv_pingtimeout; extern consvar_t cv_showping; extern consvar_t cv_pingmeasurement; extern consvar_t cv_pingicon; +extern consvar_t cv_pingstyle; //extern consvar_t cv_smallpos; extern consvar_t cv_showminimapnames; diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 53f3666a0..08c2d7c33 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2579,26 +2579,92 @@ void HU_drawPing(INT32 x, INT32 y, UINT32 lag, INT32 flags) UINT8 *colormap = NULL; INT32 measureid = cv_pingmeasurement.value ? 1 : 0; INT32 gfxnum; // gfx to draw + + //SRB2/Kart v1.0 style + UINT8 numbars = 0; // how many ping bars do we draw? + UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black) + SINT8 i = 0; + SINT8 yoffset = 6; + INT32 dx; gfxnum = Ping_gfx_num(lag); - - if (measureid == 1) - V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); - if (cv_pingicon.value) - V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]); + if (!cv_pingstyle.value) + { + if (measureid == 1) + V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); + + if (cv_pingicon.value) + V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]); - if (servermaxping && lag > servermaxping && hu_tick < 4) - colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE); // flash ping red if too high + if (servermaxping && lag > servermaxping && hu_tick < 4) + 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_pingmeasurement.value) + lag = (INT32)(lag * (1000.00f / TICRATE)); - x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, lag, colormap); + 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]); + } + else if (cv_pingstyle.value) // old style ping + { + if (cv_pingicon.value) + { + if (lag < 4) + { + numbars = 3; + barcolor = 184; + } + else if (lag < 7) + { + numbars = 2; // Apparently ternaries w/ multiple statements don't look good in C so I decided against it. + barcolor = 103; + } + else if (lag < 10) + { + numbars = 1; + barcolor = 155; // need a better red + } + else // brazil + { + numbars = 0; + barcolor = 31; + } + } - if (measureid == 0) - V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]); + if (cv_pingmeasurement.value) + lag = (INT32)(lag * (1000.00f / TICRATE)); + + if (vid.width >= 640) // how sad, we're using a shit resolution. + { + if (measureid == 1) + { + //dx = x+1 - (V_SmallStringWidth(va("%dms", lag), V_ALLOWLOWERCASE|flags)/2); + //V_DrawSmallString(dx, y+4, V_ALLOWLOWERCASE|flags, va("%dms", lag)); + V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", lag)); + } + else if (measureid == 0) + { + //dx = x+1 - (V_SmallStringWidth(va("d%d", lag), flags)/2); + //V_DrawSmallString(dx, y+4, flags, va("d%d", lag)); + V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", lag)); + } + } + + if (cv_pingicon.value) + { + for (i=0; (i<3); i++) // Draw the ping bar + { + V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags); + if (i < numbars) + V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags); + + yoffset -= 2; + } + } + } } //