fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Typo: scr_crosshaircale -> scr_crosshairscale (from Sander). 

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@490 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Steven 2011-09-21 02:51:56 +00:00
parent 8155c525b7
commit f7ac5f80f4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Quake/gl_draw.c
View File

@ -788,7 +788,7 @@ void GL_SetCanvas (canvastype newcanvas)
glViewport (glx, gly+glheight-gl_warpimagesize, gl_warpimagesize, gl_warpimagesize); glViewport (glx, gly+glheight-gl_warpimagesize, gl_warpimagesize, gl_warpimagesize);
break; break;
case CANVAS_CROSSHAIR: //0,0 is center of viewport 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); 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); glViewport (scr_vrect.x, glheight - scr_vrect.y - scr_vrect.height, scr_vrect.width & ~1, scr_vrect.height & ~1);
break; break;

4
Quake/gl_screen.c
View File

@ -86,7 +86,7 @@ cvar_t scr_sbaralpha = {"scr_sbaralpha", "0.95", true};
cvar_t scr_conwidth = {"scr_conwidth", "0", true}; cvar_t scr_conwidth = {"scr_conwidth", "0", true};
cvar_t scr_conscale = {"scr_conscale", "1", true}; cvar_t scr_conscale = {"scr_conscale", "1", true};
cvar_t scr_scale = {"scr_scale", "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_showfps = {"scr_showfps", "0"};
cvar_t scr_clock = {"scr_clock", "0"}; cvar_t scr_clock = {"scr_clock", "0"};
//johnfitz //johnfitz
@ -375,7 +375,7 @@ void SCR_Init (void)
Cvar_RegisterVariable (&scr_conwidth, &SCR_Conwidth_f); Cvar_RegisterVariable (&scr_conwidth, &SCR_Conwidth_f);
Cvar_RegisterVariable (&scr_conscale, &SCR_Conwidth_f); Cvar_RegisterVariable (&scr_conscale, &SCR_Conwidth_f);
Cvar_RegisterVariable (&scr_scale, NULL); Cvar_RegisterVariable (&scr_scale, NULL);
Cvar_RegisterVariable (&scr_crosshaircale, NULL); Cvar_RegisterVariable (&scr_crosshairscale, NULL);
Cvar_RegisterVariable (&scr_showfps, NULL); Cvar_RegisterVariable (&scr_showfps, NULL);
Cvar_RegisterVariable (&scr_clock, NULL); Cvar_RegisterVariable (&scr_clock, NULL);
//johnfitz //johnfitz

2
Quake/screen.h
View File

@ -76,7 +76,7 @@ extern cvar_t scr_sbarscale;
extern cvar_t scr_conwidth; extern cvar_t scr_conwidth;
extern cvar_t scr_conscale; extern cvar_t scr_conscale;
extern cvar_t scr_scale; extern cvar_t scr_scale;
extern cvar_t scr_crosshaircale; extern cvar_t scr_crosshairscale;
//johnfitz //johnfitz
extern int scr_tileclear_updates; //johnfitz extern int scr_tileclear_updates; //johnfitz