yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Benenne alle r_ CVAR in gl_ um

Browse source
This commit is contained in:
Yamagi Burmeister 2010-10-24 08:50:01 +00:00
parent 4f8d7137c4
commit 8b3002b1dd
5 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/cl_main.c
View file

@ -503,7 +503,7 @@ void CL_InitLocal (void)
rcon_client_password = Cvar_Get ("rcon_password", "", 0);
rcon_address = Cvar_Get ("rcon_address", "", 0);
cl_lightlevel = Cvar_Get ("r_lightlevel", "0", 0);
cl_lightlevel = Cvar_Get ("gl_lightlevel", "0", 0);
/* userinfo */
info_password = Cvar_Get ("password", "", CVAR_USERINFO);
@ -612,10 +612,10 @@ cheatvar_t cheatvars[] =
{
{"timescale", "1"},
{"timedemo", "0"},
{"r_drawworld", "1"},
{"gl_drawworld", "1"},
{"cl_testlights", "0"},
{"r_fullbright", "0"},
{"r_drawflat", "0"},
{"gl_fullbright", "0"},
{"gl_drawflat", "0"},
{"paused", "0"},
{"fixedtime", "0"},
{"sw_draworder", "0"},

18
src/refresh/header/local.h
View file

@ -162,17 +162,17 @@ extern vec3_t r_origin;
extern refdef_t r_newrefdef;
extern int r_viewcluster, r_viewcluster2, r_oldviewcluster, r_oldviewcluster2;
extern cvar_t *r_norefresh;
extern cvar_t *gl_norefresh;
extern cvar_t *r_lefthand;
extern cvar_t *r_drawentities;
extern cvar_t *r_drawworld;
extern cvar_t *r_speeds;
extern cvar_t *r_fullbright;
extern cvar_t *r_novis;
extern cvar_t *r_nocull;
extern cvar_t *r_lerpmodels;
extern cvar_t *gl_drawentities;
extern cvar_t *gl_drawworld;
extern cvar_t *gl_speeds;
extern cvar_t *gl_fullbright;
extern cvar_t *gl_novis;
extern cvar_t *gl_nocull;
extern cvar_t *gl_lerpmodels;
extern cvar_t *r_lightlevel;
extern cvar_t *gl_lightlevel;
extern cvar_t *gl_vertex_arrays;

54
src/refresh/r_main.c
View file

@ -89,17 +89,17 @@ int r_viewcluster, r_viewcluster2, r_oldviewcluster, r_oldviewcluster2;
extern qboolean have_stencil;
unsigned r_rawpalette [ 256 ];
cvar_t *r_norefresh;
cvar_t *r_drawentities;
cvar_t *r_drawworld;
cvar_t *r_speeds;
cvar_t *r_fullbright;
cvar_t *r_novis;
cvar_t *r_nocull;
cvar_t *r_lerpmodels;
cvar_t *gl_norefresh;
cvar_t *gl_drawentities;
cvar_t *gl_drawworld;
cvar_t *gl_speeds;
cvar_t *gl_fullbright;
cvar_t *gl_novis;
cvar_t *gl_nocull;
cvar_t *gl_lerpmodels;
cvar_t *r_lefthand;
cvar_t *r_lightlevel;
cvar_t *gl_lightlevel;
cvar_t *gl_nosubimage;
cvar_t *gl_allow_software;
@ -162,7 +162,7 @@ R_CullBox ( vec3_t mins, vec3_t maxs )
{
int i;
if ( r_nocull->value )
if ( gl_nocull->value )
{
return ( false );
}
@ -322,7 +322,7 @@ R_DrawEntitiesOnList ( void )
{
int i;
if ( !r_drawentities->value )
if ( !gl_drawentities->value )
{
return;
}
@ -806,7 +806,7 @@ R_Flash ( void )
void
R_RenderView ( refdef_t *fd )
{
if ( r_norefresh->value )
if ( gl_norefresh->value )
{
return;
}
@ -818,7 +818,7 @@ R_RenderView ( refdef_t *fd )
ri.Sys_Error( ERR_DROP, "R_RenderView: NULL worldmodel" );
}
if ( r_speeds->value )
if ( gl_speeds->value )
{
c_brush_polys = 0;
c_alias_polys = 0;
@ -851,7 +851,7 @@ R_RenderView ( refdef_t *fd )
R_Flash();
if ( r_speeds->value )
if ( gl_speeds->value )
{
ri.Con_Printf( PRINT_ALL, "%4i wpoly %4i epoly %i tex %i lmaps\n",
c_brush_polys,
@ -897,22 +897,22 @@ R_SetLightLevel ( void )
{
if ( shadelight [ 0 ] > shadelight [ 2 ] )
{
r_lightlevel->value = 150 * shadelight [ 0 ];
gl_lightlevel->value = 150 * shadelight [ 0 ];
}
else
{
r_lightlevel->value = 150 * shadelight [ 2 ];
gl_lightlevel->value = 150 * shadelight [ 2 ];
}
}
else
{
if ( shadelight [ 1 ] > shadelight [ 2 ] )
{
r_lightlevel->value = 150 * shadelight [ 1 ];
gl_lightlevel->value = 150 * shadelight [ 1 ];
}
else
{
r_lightlevel->value = 150 * shadelight [ 2 ];
gl_lightlevel->value = 150 * shadelight [ 2 ];
}
}
}
@ -929,16 +929,16 @@ void
R_Register ( void )
{
r_lefthand = ri.Cvar_Get( "hand", "0", CVAR_USERINFO | CVAR_ARCHIVE );
r_norefresh = ri.Cvar_Get( "r_norefresh", "0", 0 );
r_fullbright = ri.Cvar_Get( "r_fullbright", "0", 0 );
r_drawentities = ri.Cvar_Get( "r_drawentities", "1", 0 );
r_drawworld = ri.Cvar_Get( "r_drawworld", "1", 0 );
r_novis = ri.Cvar_Get( "r_novis", "0", 0 );
r_nocull = ri.Cvar_Get( "r_nocull", "0", 0 );
r_lerpmodels = ri.Cvar_Get( "r_lerpmodels", "1", 0 );
r_speeds = ri.Cvar_Get( "r_speeds", "0", 0 );
gl_norefresh = ri.Cvar_Get( "gl_norefresh", "0", 0 );
gl_fullbright = ri.Cvar_Get( "gl_fullbright", "0", 0 );
gl_drawentities = ri.Cvar_Get( "gl_drawentities", "1", 0 );
gl_drawworld = ri.Cvar_Get( "gl_drawworld", "1", 0 );
gl_novis = ri.Cvar_Get( "gl_novis", "0", 0 );
gl_nocull = ri.Cvar_Get( "gl_nocull", "0", 0 );
gl_lerpmodels = ri.Cvar_Get( "gl_lerpmodels", "1", 0 );
gl_speeds = ri.Cvar_Get( "gl_speeds", "0", 0 );
r_lightlevel = ri.Cvar_Get( "r_lightlevel", "0", 0 );
gl_lightlevel = ri.Cvar_Get( "gl_lightlevel", "0", 0 );
gl_nosubimage = ri.Cvar_Get( "gl_nosubimage", "0", 0 );
gl_allow_software = ri.Cvar_Get( "gl_allow_software", "0", 0 );

10
src/refresh/r_mesh.c
View file

@ -601,22 +601,22 @@ R_DrawAliasModel ( entity_t *e )
{
if ( shadelight [ 0 ] > shadelight [ 2 ] )
{
r_lightlevel->value = 150 * shadelight [ 0 ];
gl_lightlevel->value = 150 * shadelight [ 0 ];
}
else
{
r_lightlevel->value = 150 * shadelight [ 2 ];
gl_lightlevel->value = 150 * shadelight [ 2 ];
}
}
else
{
if ( shadelight [ 1 ] > shadelight [ 2 ] )
{
r_lightlevel->value = 150 * shadelight [ 1 ];
gl_lightlevel->value = 150 * shadelight [ 1 ];
}
else
{
r_lightlevel->value = 150 * shadelight [ 2 ];
gl_lightlevel->value = 150 * shadelight [ 2 ];
}
}
}
@ -762,7 +762,7 @@ R_DrawAliasModel ( entity_t *e )
currententity->oldframe = 0;
}
if ( !r_lerpmodels->value )
if ( !gl_lerpmodels->value )
{
currententity->backlerp = 0;
}

8
src/refresh/r_surf.c
View file

@ -215,7 +215,7 @@ R_BlendLightmaps ( void )
msurface_t *surf, *newdrawsurf = 0;
/* don't bother if we're set to fullbright */
if ( r_fullbright->value )
if ( gl_fullbright->value )
{
return;
}
@ -822,7 +822,7 @@ R_DrawWorld ( void )
{
entity_t ent;
if ( !r_drawworld->value )
if ( !gl_drawworld->value )
{
return;
}
@ -870,7 +870,7 @@ R_MarkLeaves ( void )
mleaf_t *leaf;
int cluster;
if ( ( r_oldviewcluster == r_viewcluster ) && ( r_oldviewcluster2 == r_viewcluster2 ) && !r_novis->value &&
if ( ( r_oldviewcluster == r_viewcluster ) && ( r_oldviewcluster2 == r_viewcluster2 ) && !gl_novis->value &&
( r_viewcluster != -1 ) )
{
return;
@ -887,7 +887,7 @@ R_MarkLeaves ( void )
r_oldviewcluster = r_viewcluster;
r_oldviewcluster2 = r_viewcluster2;
if ( r_novis->value || ( r_viewcluster == -1 ) || !r_worldmodel->vis )
if ( gl_novis->value || ( r_viewcluster == -1 ) || !r_worldmodel->vis )
{
/* mark everything */
for ( i = 0; i < r_worldmodel->numleafs; i++ )