diff --git a/Quake/gl_draw.c b/Quake/gl_draw.c index db3b4f2b..a1c9937c 100644 --- a/Quake/gl_draw.c +++ b/Quake/gl_draw.c @@ -788,7 +788,7 @@ void GL_SetCanvas (canvastype newcanvas) glViewport (glx, gly+glheight-gl_warpimagesize, gl_warpimagesize, gl_warpimagesize); break; case CANVAS_CROSSHAIR: //0,0 is center of viewport - s = CLAMP (1.0, scr_crosshaircale.value, 10.0); + s = CLAMP (1.0, scr_crosshairscale.value, 10.0); glOrtho (scr_vrect.width/-2/s, scr_vrect.width/2/s, scr_vrect.height/2/s, scr_vrect.height/-2/s, -99999, 99999); glViewport (scr_vrect.x, glheight - scr_vrect.y - scr_vrect.height, scr_vrect.width & ~1, scr_vrect.height & ~1); break; diff --git a/Quake/gl_screen.c b/Quake/gl_screen.c index a4fe6cb1..d1f73649 100644 --- a/Quake/gl_screen.c +++ b/Quake/gl_screen.c @@ -86,7 +86,7 @@ cvar_t scr_sbaralpha = {"scr_sbaralpha", "0.95", true}; cvar_t scr_conwidth = {"scr_conwidth", "0", true}; cvar_t scr_conscale = {"scr_conscale", "1", true}; cvar_t scr_scale = {"scr_scale", "1", true}; -cvar_t scr_crosshaircale = {"scr_crosshaircale", "1", true}; +cvar_t scr_crosshairscale = {"scr_crosshairscale", "1", true}; cvar_t scr_showfps = {"scr_showfps", "0"}; cvar_t scr_clock = {"scr_clock", "0"}; //johnfitz @@ -375,7 +375,7 @@ void SCR_Init (void) Cvar_RegisterVariable (&scr_conwidth, &SCR_Conwidth_f); Cvar_RegisterVariable (&scr_conscale, &SCR_Conwidth_f); Cvar_RegisterVariable (&scr_scale, NULL); - Cvar_RegisterVariable (&scr_crosshaircale, NULL); + Cvar_RegisterVariable (&scr_crosshairscale, NULL); Cvar_RegisterVariable (&scr_showfps, NULL); Cvar_RegisterVariable (&scr_clock, NULL); //johnfitz diff --git a/Quake/screen.h b/Quake/screen.h index 3f35cb37..1050b381 100644 --- a/Quake/screen.h +++ b/Quake/screen.h @@ -76,7 +76,7 @@ extern cvar_t scr_sbarscale; extern cvar_t scr_conwidth; extern cvar_t scr_conscale; extern cvar_t scr_scale; -extern cvar_t scr_crosshaircale; +extern cvar_t scr_crosshairscale; //johnfitz extern int scr_tileclear_updates; //johnfitz