qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-30 00:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cvar merge... segfault problems... also unknown problems in vid_svga.c

Browse source
This commit is contained in:
Dan Olson 2000-05-16 04:47:41 +00:00
parent 5c58a21a1c
commit 1d26c02826
74 changed files with 4288 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

44
source/draw.c
View file

@ -45,7 +45,9 @@ byte *draw_chars; // 8*8 graphic characters
qpic_t *draw_disc;
qpic_t *draw_backtile;
cvar_t cl_verstring = {"cl_verstring", "QuakeForge " QF_VERSION};
/* cvar_t cl_verstring = {"cl_verstring", "QuakeForge " QF_VERSION};
CVAR_FIXME */
cvar_t *cl_verstring;
//=============================================================================
/* Support Routines */
@ -128,7 +130,9 @@ void Draw_Init (void)
r_rectdesc.ptexbytes = draw_backtile->data;
r_rectdesc.rowbytes = draw_backtile->width;
Cvar_RegisterVariable (&cl_verstring);
/* Cvar_RegisterVariable (&cl_verstring);
CVAR_FIXME */
cl_verstring = Cvar_Get("cl_verstring", "QuakeForge " QF_VERSION, CVAR_NONE, "None");
}
@ -283,13 +287,23 @@ void Draw_Pixel(int x, int y, byte color)
void Draw_Crosshair(void)
{
int x, y;
extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor;
/* extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor;
CVAR_FIXME */
extern cvar_t *crosshair, *cl_crossx, *cl_crossy, *crosshaircolor;
extern vrect_t scr_vrect;
byte c = (byte)crosshaircolor.value;
/* byte c = (byte)crosshaircolor.value;
CVAR_FIXME */
byte c = (byte)crosshaircolor->value;
if (crosshair.value == 2) {
x = scr_vrect.x + scr_vrect.width/2 + cl_crossx.value;
y = scr_vrect.y + scr_vrect.height/2 + cl_crossy.value;
/* if (crosshair.value == 2) {
CVAR_FIXME */
if (crosshair->value == 2) {
/* x = scr_vrect.x + scr_vrect.width/2 + cl_crossx.value;
CVAR_FIXME */
x = scr_vrect.x + scr_vrect.width/2 + cl_crossx->value;
/* y = scr_vrect.y + scr_vrect.height/2 + cl_crossy.value;
CVAR_FIXME */
y = scr_vrect.y + scr_vrect.height/2 + cl_crossy->value;
Draw_Pixel(x - 1, y, c);
Draw_Pixel(x - 3, y, c);
Draw_Pixel(x + 1, y, c);
@ -298,10 +312,16 @@ void Draw_Crosshair(void)
Draw_Pixel(x, y - 3, c);
Draw_Pixel(x, y + 1, c);
Draw_Pixel(x, y + 3, c);
} else if (crosshair.value)
/* } else if (crosshair.value)
CVAR_FIXME */
} else if (crosshair->value)
Draw_Character (
scr_vrect.x + scr_vrect.width/2-4 + cl_crossx.value,
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy.value,
/* scr_vrect.x + scr_vrect.width/2-4 + cl_crossx.value,
CVAR_FIXME */
scr_vrect.x + scr_vrect.width/2-4 + cl_crossx->value,
/* scr_vrect.y + scr_vrect.height/2-4 + cl_crossy.value,
CVAR_FIXME */
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy->value,
'+');
}
@ -695,8 +715,8 @@ void Draw_ConsoleBackground (int lines)
}
}
Draw_Alt_String (vid.conwidth - strlen(cl_verstring.string)*8 - 11,
lines-14, cl_verstring.string);
Draw_Alt_String (vid.conwidth - strlen(cl_verstring->string)*8 - 11,
lines-14, cl_verstring->string);
}