yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-25 14:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added a speedometer that displays the player's speed in QU/s. Wasn't quite sure how to implement it without adding GetPlayerSpeed() to pmove.c. Unsure if there is a cleaner way to do this while keeping it inside cl_screen.c

Browse source
This commit is contained in:
Feels Duck Man 2024-03-01 14:05:36 -06:00
parent e72ef48ae7
commit cfece2f55d
3 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/cl_main.c
View file

@ -43,6 +43,7 @@ cvar_t *cl_footsteps;
cvar_t *cl_timeout;
cvar_t *cl_predict;
cvar_t *cl_showfps;
cvar_t *cl_showspeed;
cvar_t *cl_gun;
cvar_t *cl_add_particles;
cvar_t *cl_add_lights;
@ -513,6 +514,7 @@ CL_InitLocal(void)
cl_noskins = Cvar_Get("cl_noskins", "0", 0);
cl_predict = Cvar_Get("cl_predict", "1", 0);
cl_showfps = Cvar_Get("cl_showfps", "0", CVAR_ARCHIVE);
cl_showspeed = Cvar_Get("cl_showspeed", "0", CVAR_ARCHIVE);
cl_upspeed = Cvar_Get("cl_upspeed", "200", 0);
cl_forwardspeed = Cvar_Get("cl_forwardspeed", "200", 0);

29
src/client/cl_screen.c
View file

@ -66,6 +66,8 @@ int crosshair_width, crosshair_height;
extern cvar_t *cl_showfps;
extern cvar_t *crosshair_scale;
extern cvar_t *cl_showspeed;
extern float GetPlayerSpeed();
void SCR_TimeRefresh_f(void);
void SCR_Loading_f(void);
@ -1447,6 +1449,32 @@ SCR_DrawLayout(void)
// ----
void
SCR_DrawSpeed(void) {
if (cl_showspeed->value < 1)
return;
float speed, speedxy; // speed, horizontal ground speed
GetPlayerSpeed(&speed, &speedxy);
// Assuming viddef.width is the width of the screen
float scale = SCR_GetConsoleScale();
char str[64];
snprintf(str, sizeof(str), "Speed: %7.2f (%7.2f) QU/s", speed, speedxy);
int yPos = 0;
// If showfps is on, position the speedometer underneath it
if (cl_showfps->value == 1 || cl_showfps->value == 2)
yPos = scale * 10;
if (cl_showfps->value > 2)
yPos = scale * 20;
DrawStringScaled(viddef.width - scale * (strlen(str) * 8 + 2), yPos, str, scale);
//Unsure if these are necessary
SCR_AddDirtyPoint(viddef.width - scale * (strlen(str) * 8 + 2), yPos);
SCR_AddDirtyPoint(viddef.width, yPos);
}
void
SCR_Framecounter(void) {
long long newtime;
@ -1684,6 +1712,7 @@ SCR_UpdateScreen(void)
}
SCR_Framecounter();
SCR_DrawSpeed();
R_EndFrame();
}

6
src/common/pmove.c
View file

@ -341,6 +341,12 @@ PM_Friction(void)
vel[2] = vel[2] * newspeed;
}
//Used for speedoomter display.
void GetPlayerSpeed(float* speed, float* speedxy) {
*speedxy = sqrt(pml.velocity[0] * pml.velocity[0] + pml.velocity[1] * pml.velocity[1]);
*speed = VectorLength(pml.velocity);
}
/*
* Handles user intended acceleration
*/