eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

crosshair correction, again...

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1404 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-09-30 03:17:51 +00:00
parent 81e7b2020d
commit 690bb8cb0a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
engine/gl/gl_draw.c
View file

@ -1289,7 +1289,7 @@ void GLDraw_Crosshair(void)
static int externalhair; static int externalhair;
float x1, x2, y1, y2; float x1, x2, y1, y2;
float size; float size, chc;
if (crosshair.value == 1 && !*crosshairimage.string) if (crosshair.value == 1 && !*crosshairimage.string)
{ {
@ -1310,6 +1310,7 @@ void GLDraw_Crosshair(void)
externalhair = Mod_LoadHiResTexture (crosshairimage.string, "crosshairs", false, true, true); externalhair = Mod_LoadHiResTexture (crosshairimage.string, "crosshairs", false, true, true);
} }
GL_Bind (externalhair); GL_Bind (externalhair);
chc = 0;
qglEnable (GL_BLEND); qglEnable (GL_BLEND);
qglDisable(GL_ALPHA_TEST); qglDisable(GL_ALPHA_TEST);
@ -1317,6 +1318,7 @@ void GLDraw_Crosshair(void)
else if (crosshair.value) else if (crosshair.value)
{ {
GL_Bind (cs_texture); GL_Bind (cs_texture);
chc = 1/16;
if (crosshair.modified || crosshaircolor.modified || crosshair.value >= FIRSTANIMATEDCROSHAIR) if (crosshair.modified || crosshaircolor.modified || crosshair.value >= FIRSTANIMATEDCROSHAIR)
{ {
@ -1395,17 +1397,17 @@ void GLDraw_Crosshair(void)
return; return;
qglColor4f(1, 1, 1, crosshairalpha.value); qglColor4f(1, 1, 1, crosshairalpha.value);
size = crosshairsize.value;
chc = size * chc;
for (sc = 0; sc < cl.splitclients; sc++) for (sc = 0; sc < cl.splitclients; sc++)
{ {
SCR_CrosshairPosition(sc, &x, &y); SCR_CrosshairPosition(sc, &x, &y);
size = crosshairsize.value; x1 = x - size - chc;
// (size / 16) is needed to assure it's exactly centered x2 = x + size - chc;
x1 = x - size - (size / 16); y1 = y - size - chc;
x2 = x + size - (size / 16); y2 = y + size - chc;
y1 = y - size - (size / 16);
y2 = y + size - (size / 16);
qglBegin (GL_QUADS); qglBegin (GL_QUADS);
qglTexCoord2f (0, 0); qglTexCoord2f (0, 0);
qglVertex2f (x1, y1); qglVertex2f (x1, y1);