yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added an option to draw speed under the crosshair with cl_showspeed 2, fixed drawing the speedometer when the game wasn't playing.

This commit is contained in:
Feels Duck Man 2024-03-10 10:02:39 -05:00
parent 9cff22b55c
commit cf5b3687f2
1 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/client/cl_screen.c
View File

@ -1450,28 +1450,55 @@ SCR_DrawLayout(void)
// ---- // ----
void void
SCR_DrawSpeed(void) { SCR_DrawSpeed(void)
if (cl_showspeed->value < 1) {
if (cl_showspeed->value < 1) //Disabled, do nothing
return; return;
float speed, speedxy; // speed, horizontal ground speed
GetPlayerSpeed(&speed, &speedxy);
char spd_str[32];
float speed, speedxy;
float scale = SCR_GetConsoleScale(); float scale = SCR_GetConsoleScale();
char str[64]; int str_len, xPos, yPos = 0;
snprintf(str, sizeof(str), "%6.2f (%6.2f) QU/s", speed, speedxy);
int yPos = 0; GetPlayerSpeed(&speed, &speedxy);
// If showfps is on, position the speedometer underneath it snprintf(spd_str, sizeof(spd_str), "%6.2f (%6.2f) QU/s", speed, speedxy);
if (cl_showfps->value == 1 || cl_showfps->value == 2) str_len = scale * (strlen(spd_str) * 8 + 2);
if (cl_showspeed->value == 1) //Draw speed and xy speed at top right
{
xPos = viddef.width - str_len;
if (cl_showfps->value == 1 || cl_showfps->value == 2) // If showfps is enabled, draw it underneath
{
yPos = scale * 10; yPos = scale * 10;
if (cl_showfps->value > 2) }
else if (cl_showfps->value > 2)
{
yPos = scale * 20; yPos = scale * 20;
}
DrawStringScaled(viddef.width - scale * (strlen(str) * 8 + 2), yPos, str, scale); DrawStringScaled(xPos, yPos, spd_str, scale);
SCR_AddDirtyPoint(viddef.width - scale * (strlen(str) * 8 + 2), yPos); SCR_AddDirtyPoint(xPos, yPos);
SCR_AddDirtyPoint(viddef.width, yPos); SCR_AddDirtyPoint(viddef.width, yPos);
} }
else if (cl_showspeed->value > 1) //Draw only xy speed under the crosshair
{
if (scale != 1) // Check if low resolution
{
scale -= 1;
}
snprintf(spd_str, sizeof(spd_str), "%6.2f", speedxy);
str_len = scale * (strlen(spd_str) * 8 + 2);
yPos = scr_vrect.y + (scr_vrect.height / 2) + (scale * 10);
xPos = scr_vrect.x + (scr_vrect.width / 2) - (str_len / 2);
DrawStringScaled(xPos, yPos, spd_str, scale);
SCR_AddDirtyPoint(xPos, yPos);
SCR_AddDirtyPoint(xPos + str_len, yPos);
}
}
void void
SCR_Framecounter(void) { SCR_Framecounter(void) {
@ -1674,6 +1701,7 @@ SCR_UpdateScreen(void)
V_RenderView(separation[i]); V_RenderView(separation[i]);
SCR_DrawStats(); SCR_DrawStats();
SCR_DrawSpeed();
if (cl.frame.playerstate.stats[STAT_LAYOUTS] & 1) if (cl.frame.playerstate.stats[STAT_LAYOUTS] & 1)
{ {
@ -1710,7 +1738,6 @@ SCR_UpdateScreen(void)
} }
SCR_Framecounter(); SCR_Framecounter();
SCR_DrawSpeed();
R_EndFrame(); R_EndFrame();
} }