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

small build clean up

This commit is contained in:
Denis Pauk 2024-03-21 23:28:43 +02:00
parent 80edb06b79
commit 51407d7139
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -396,6 +396,7 @@ config:
@echo "YQ2_ARCH = $(YQ2_ARCH) COMPILER = $(COMPILER)" @echo "YQ2_ARCH = $(YQ2_ARCH) COMPILER = $(COMPILER)"
@echo "WITH_CURL = $(WITH_CURL)" @echo "WITH_CURL = $(WITH_CURL)"
@echo "WITH_OPENAL = $(WITH_OPENAL)" @echo "WITH_OPENAL = $(WITH_OPENAL)"
@echo "WITH_AVCODEC = $(WITH_AVCODEC)"
@echo "WITH_RPATH = $(WITH_RPATH)" @echo "WITH_RPATH = $(WITH_RPATH)"
@echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)" @echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)"
@echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)" @echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)"

2
src/client/cl_main.c
View File

@ -515,7 +515,7 @@ CL_InitLocal(void)
cl_noskins = Cvar_Get("cl_noskins", "0", 0); cl_noskins = Cvar_Get("cl_noskins", "0", 0);
cl_predict = Cvar_Get("cl_predict", "1", 0); cl_predict = Cvar_Get("cl_predict", "1", 0);
cl_showfps = Cvar_Get("cl_showfps", "0", CVAR_ARCHIVE); cl_showfps = Cvar_Get("cl_showfps", "0", CVAR_ARCHIVE);
cl_showspeed = Cvar_Get("cl_showspeed", "0", CVAR_ARCHIVE); cl_showspeed = Cvar_Get("cl_showspeed", "0", CVAR_ARCHIVE);
cl_upspeed = Cvar_Get("cl_upspeed", "200", 0); cl_upspeed = Cvar_Get("cl_upspeed", "200", 0);
cl_forwardspeed = Cvar_Get("cl_forwardspeed", "200", 0); cl_forwardspeed = Cvar_Get("cl_forwardspeed", "200", 0);

12
src/client/cl_screen.c
View File

@ -67,7 +67,7 @@ int crosshair_width, crosshair_height;
extern cvar_t *cl_showfps; extern cvar_t *cl_showfps;
extern cvar_t *crosshair_scale; extern cvar_t *crosshair_scale;
extern cvar_t *cl_showspeed; extern cvar_t *cl_showspeed;
extern float GetPlayerSpeed(); extern float GetPlayerSpeed();
void SCR_TimeRefresh_f(void); void SCR_TimeRefresh_f(void);
void SCR_Loading_f(void); void SCR_Loading_f(void);
@ -1450,8 +1450,8 @@ SCR_DrawLayout(void)
// ---- // ----
void void
SCR_DrawSpeed(void) SCR_DrawSpeed(void)
{ {
if (cl_showspeed->value < 1) //Disabled, do nothing if (cl_showspeed->value < 1) //Disabled, do nothing
return; return;
@ -1460,11 +1460,11 @@ SCR_DrawSpeed(void)
float speed, speedxy; float speed, speedxy;
float scale = SCR_GetConsoleScale(); float scale = SCR_GetConsoleScale();
int str_len, xPos, yPos = 0; int str_len, xPos, yPos = 0;
GetPlayerSpeed(&speed, &speedxy); GetPlayerSpeed(&speed, &speedxy);
snprintf(spd_str, sizeof(spd_str), "%6.2f (%6.2f) QU/s", speed, speedxy); snprintf(spd_str, sizeof(spd_str), "%6.2f (%6.2f) QU/s", speed, speedxy);
str_len = scale * (strlen(spd_str) * 8 + 2); str_len = scale * (strlen(spd_str) * 8 + 2);
if (cl_showspeed->value == 1) //Draw speed and xy speed at top right if (cl_showspeed->value == 1) //Draw speed and xy speed at top right
{ {
xPos = viddef.width - str_len; xPos = viddef.width - str_len;
@ -1494,7 +1494,7 @@ SCR_DrawSpeed(void)
str_len = scale * (strlen(spd_str) * 8 + 2); str_len = scale * (strlen(spd_str) * 8 + 2);
yPos = scr_vrect.y + (scr_vrect.height / 2) + (scale * 10); yPos = scr_vrect.y + (scr_vrect.height / 2) + (scale * 10);
xPos = scr_vrect.x + (scr_vrect.width / 2) - (str_len / 2); xPos = scr_vrect.x + (scr_vrect.width / 2) - (str_len / 2);
DrawStringScaled(xPos, yPos, spd_str, scale); DrawStringScaled(xPos, yPos, spd_str, scale);
SCR_AddDirtyPoint(xPos, yPos); SCR_AddDirtyPoint(xPos, yPos);
SCR_AddDirtyPoint(xPos + str_len, yPos); SCR_AddDirtyPoint(xPos + str_len, yPos);

12
src/client/menu/videomenu.c
View File

@ -425,7 +425,7 @@ VID_MenuInit(void)
"on", "on",
0 0
}; };
static const char *yesno_names[] = { static const char *yesno_names[] = {
"no", "no",
"yes", "yes",
@ -721,7 +721,7 @@ VID_MenuInit(void)
pow(2, s_msaa_list.curvalue) <= gl_msaa_samples->value); pow(2, s_msaa_list.curvalue) <= gl_msaa_samples->value);
s_msaa_list.curvalue--; s_msaa_list.curvalue--;
} }
s_filter_list.generic.type = MTYPE_SPINCONTROL; s_filter_list.generic.type = MTYPE_SPINCONTROL;
s_filter_list.generic.name = "texture filter"; s_filter_list.generic.name = "texture filter";
s_filter_list.curvalue = 0; s_filter_list.curvalue = 0;
@ -729,14 +729,14 @@ VID_MenuInit(void)
const char* filter = NULL; const char* filter = NULL;
int mode = 0; int mode = 0;
if (Q_stricmp(vid_renderer->string, "gl3") == 0 || Q_stricmp(vid_renderer->string, "gles3") == 0 || if (Q_stricmp(vid_renderer->string, "gl3") == 0 || Q_stricmp(vid_renderer->string, "gles3") == 0 ||
Q_stricmp(vid_renderer->string, "gl1") == 0) Q_stricmp(vid_renderer->string, "gl1") == 0)
{ {
s_filter_list.generic.x = 0; s_filter_list.generic.x = 0;
s_filter_list.generic.y = (y += 10); s_filter_list.generic.y = (y += 10);
s_filter_list.itemnames = filter_names; s_filter_list.itemnames = filter_names;
filter = Cvar_VariableString("gl_texturemode"); filter = Cvar_VariableString("gl_texturemode");
mode = 3; mode = 3;
@ -765,7 +765,7 @@ VID_MenuInit(void)
if (Q_stricmp(filter, "1") == 0) if (Q_stricmp(filter, "1") == 0)
{ {
mode = 1; mode = 1;
} }
} }
s_filter_list.curvalue = mode; s_filter_list.curvalue = mode;