Rename gl_drawentities to r_drawentities.

This commit is contained in:
Yamagi Burmeister 2018-01-06 16:53:45 +01:00
parent 54fc79e6b1
commit aa4d92e8dd
5 changed files with 11 additions and 10 deletions

View file

@ -40,7 +40,7 @@ string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
option(ZIP_SUPPORT "ZIP support" ON)
option(OGG_SUPPORT "OGG Vorbis playback support (Music)" ON)
option(OPENAL_SUPPORT "OpenAL support" ON)
option(SOFTRENDERER_SUPPORT "Enabled the software renderer" OFF)
option(SOFTRENDERER_SUPPORT "Enabled the software renderer" ON)
option(SYSTEMWIDE_SUPPORT "Enable systemwide installation of game assets" OFF)
# These variables will act as our list of include folders and linker flags

View file

@ -167,7 +167,7 @@ extern int r_viewcluster, r_viewcluster2, r_oldviewcluster, r_oldviewcluster2;
extern cvar_t *gl_norefresh;
extern cvar_t *gl_lefthand;
extern cvar_t *gl_farsee;
extern cvar_t *gl_drawentities;
extern cvar_t *r_drawentities;
extern cvar_t *gl_drawworld;
extern cvar_t *gl_speeds;
extern cvar_t *gl_fullbright;

View file

@ -70,7 +70,7 @@ extern qboolean have_stencil;
unsigned r_rawpalette[256];
cvar_t *gl_norefresh;
cvar_t *gl_drawentities;
cvar_t *r_drawentities;
cvar_t *gl_drawworld;
cvar_t *gl_speeds;
cvar_t *gl_fullbright;
@ -320,7 +320,7 @@ R_DrawEntitiesOnList(void)
{
int i;
if (!gl_drawentities->value)
if (!r_drawentities->value)
{
return;
}
@ -1202,7 +1202,7 @@ R_Register(void)
gl_farsee = ri.Cvar_Get("gl_farsee", "0", CVAR_LATCH | CVAR_ARCHIVE);
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);
r_drawentities = ri.Cvar_Get("r_drawentities", "1", 0);
gl_drawworld = ri.Cvar_Get("gl_drawworld", "1", 0);
gl_novis = ri.Cvar_Get("gl_novis", "0", 0);
gl_lerpmodels = ri.Cvar_Get("gl_lerpmodels", "1", 0);

View file

@ -107,7 +107,7 @@ cvar_t *gl_lightlevel;
cvar_t *gl3_overbrightbits;
cvar_t *gl_norefresh;
cvar_t *gl_drawentities;
cvar_t *r_drawentities;
cvar_t *gl_drawworld;
cvar_t *gl_nolerp_list;
cvar_t *gl_nobind;
@ -212,7 +212,7 @@ GL3_Register(void)
gl3_particle_square = ri.Cvar_Get("gl3_particle_square", "0", CVAR_ARCHIVE);
gl_norefresh = ri.Cvar_Get("gl_norefresh", "0", 0);
gl_drawentities = ri.Cvar_Get("gl_drawentities", "1", 0);
r_drawentities = ri.Cvar_Get("r_drawentities", "1", 0);
gl_drawworld = ri.Cvar_Get("gl_drawworld", "1", 0);
gl_fullbright = ri.Cvar_Get("gl_fullbright", "0", 0);
@ -251,7 +251,7 @@ GL3_Register(void)
//gl_farsee = ri.Cvar_Get("gl_farsee", "0", CVAR_LATCH | CVAR_ARCHIVE);
//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);
//r_drawentities = ri.Cvar_Get("r_drawentities", "1", 0);
//gl_drawworld = ri.Cvar_Get("gl_drawworld", "1", 0);
//gl_novis = ri.Cvar_Get("gl_novis", "0", 0);
//gl_lerpmodels = ri.Cvar_Get("gl_lerpmodels", "1", 0); NOTE: screw this, it looks horrible without
@ -892,7 +892,7 @@ GL3_DrawEntitiesOnList(void)
{
int i;
if (!gl_drawentities->value)
if (!r_drawentities->value)
{
return;
}

View file

@ -37,7 +37,8 @@ typedef struct
/* An ugly hack to rewrite CVARs loaded from config.cfg */
replacement_t replacements[] = {
{"cl_drawfps", "cl_showfps"}
{"cl_drawfps", "cl_showfps"},
{"gl_drawentities", "r_drawentities"}
};