qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-06-02 10:01:54 +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

60
source/r_misc.c
View file

@ -41,9 +41,13 @@ void R_CheckVariables (void)
#if 0
static float oldbright;
if (r_fullbright.value != oldbright)
/* if (r_fullbright.value != oldbright)
CVAR_FIXME */
if (r_fullbright->value != oldbright)
{
oldbright = r_fullbright.value;
/* oldbright = r_fullbright.value;
CVAR_FIXME */
oldbright = r_fullbright->value;
D_FlushCaches (); // so all lighting changes
}
#endif
@ -130,7 +134,9 @@ void R_LineGraph (int x, int y, int h)
dest = vid.buffer + vid.rowbytes*y + x;
s = r_graphheight.value;
/* s = r_graphheight.value;
CVAR_FIXME */
s = r_graphheight->value;
if (h == 10000)
color = 0x6f; // yellow
@ -180,7 +186,9 @@ void R_TimeGraph (void)
a = (r_time2-r_time1)/0.01;
//a = fabs(mouse_y * 0.05);
//a = (int)((r_refdef.vieworg[2] + 1024)/1)%(int)r_graphheight.value;
/* //a = (int)((r_refdef.vieworg[2] + 1024)/1)%(int)r_graphheight.value;
CVAR_FIXME */
//a = (int)((r_refdef.vieworg[2] + 1024)/1)%(int)r_graphheight->value;
//a = (int)((pmove.velocity[2] + 500)/10);
//a = fabs(velocity[0])/20;
//a = ((int)fabs(origin[0])/8)%20;
@ -227,9 +235,13 @@ void R_NetGraph (void)
w = NET_TIMINGS;
x = w - ((vid.width - 320)>>1);
y = vid.height - sb_lines - 24 - (int)r_graphheight.value*2 - 2;
/* y = vid.height - sb_lines - 24 - (int)r_graphheight.value*2 - 2;
CVAR_FIXME */
y = vid.height - sb_lines - 24 - (int)r_graphheight->value*2 - 2;
M_DrawTextBox (x, y, (w+7)/8, ((int)r_graphheight.value*2+7)/8 + 1);
/* M_DrawTextBox (x, y, (w+7)/8, ((int)r_graphheight.value*2+7)/8 + 1);
CVAR_FIXME */
M_DrawTextBox (x, y, (w+7)/8, ((int)r_graphheight->value*2+7)/8 + 1);
y2 = y + 8;
y = vid.height - sb_lines - 8 - 2;
@ -454,12 +466,22 @@ void R_SetupFrame (void)
float w, h;
// don't allow cheats in multiplayer
r_draworder.value = 0;
r_fullbright.value = 0;
r_ambient.value = 0;
r_drawflat.value = 0;
/* r_draworder.value = 0;
CVAR_FIXME */
r_draworder->value = 0;
/* r_fullbright.value = 0;
CVAR_FIXME */
r_fullbright->value = 0;
/* r_ambient.value = 0;
CVAR_FIXME */
r_ambient->value = 0;
/* r_drawflat.value = 0;
CVAR_FIXME */
r_drawflat->value = 0;
if (r_numsurfs.value)
/* if (r_numsurfs.value)
CVAR_FIXME */
if (r_numsurfs->value)
{
if ((surface_p - surfaces) > r_maxsurfsseen)
r_maxsurfsseen = surface_p - surfaces;
@ -468,7 +490,9 @@ r_drawflat.value = 0;
surf_max - surfaces, r_maxsurfsseen);
}
if (r_numedges.value)
/* if (r_numedges.value)
CVAR_FIXME */
if (r_numedges->value)
{
edgecount = edge_p - r_edges;
@ -479,13 +503,17 @@ r_drawflat.value = 0;
r_numallocatededges, r_maxedgesseen);
}
r_refdef.ambientlight = r_ambient.value;
/* r_refdef.ambientlight = r_ambient.value;
CVAR_FIXME */
r_refdef.ambientlight = r_ambient->value;
if (r_refdef.ambientlight < 0)
r_refdef.ambientlight = 0;
// if (!sv.active)
r_draworder.value = 0; // don't let cheaters look behind walls
/* r_draworder.value = 0; // don't let cheaters look behind walls
CVAR_FIXME */
r_draworder->value = 0; // don't let cheaters look behind walls
R_CheckVariables ();
@ -516,7 +544,9 @@ r_refdef.viewangles[2]= 0;
r_viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
r_dowarpold = r_dowarp;
r_dowarp = r_waterwarp.value && (r_viewleaf->contents <= CONTENTS_WATER);
/* r_dowarp = r_waterwarp.value && (r_viewleaf->contents <= CONTENTS_WATER);
CVAR_FIXME */
r_dowarp = r_waterwarp->value && (r_viewleaf->contents <= CONTENTS_WATER);
if ((r_dowarp != r_dowarpold) || r_viewchanged)
{