yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename gl_dynamic to gl1_dynamic and remove it from GL3.

Browse source
This commit is contained in:
Yamagi Burmeister 2018-01-09 09:28:52 +01:00
parent 03098715ee
commit d2b3030cfe
6 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/refresh/gl/header/local.h
View file

@ -198,7 +198,7 @@ extern cvar_t *gl_nolerp_list;
extern cvar_t *gl_lightmap;
extern cvar_t *gl_shadows;
extern cvar_t *gl_stencilshadow;
extern cvar_t *gl_dynamic;
extern cvar_t *gl1_dynamic;
extern cvar_t *gl_nobind;
extern cvar_t *gl_round_down;
extern cvar_t *gl_picmip;

4
src/client/refresh/gl/r_main.c
View file

@ -105,7 +105,7 @@ cvar_t *gl_retexturing;
cvar_t *gl_nolerp_list;
cvar_t *gl_dynamic;
cvar_t *gl1_dynamic;
cvar_t *gl_modulate;
cvar_t *gl_nobind;
cvar_t *gl_round_down;
@ -1223,7 +1223,7 @@ R_Register(void)
gl_lightmap = ri.Cvar_Get("gl_lightmap", "0", 0);
gl_shadows = ri.Cvar_Get("gl_shadows", "0", CVAR_ARCHIVE);
gl_stencilshadow = ri.Cvar_Get("gl_stencilshadow", "0", CVAR_ARCHIVE);
gl_dynamic = ri.Cvar_Get("gl_dynamic", "1", 0);
gl1_dynamic = ri.Cvar_Get("gl1_dynamic", "1", 0);
gl_nobind = ri.Cvar_Get("gl_nobind", "0", 0);
gl_round_down = ri.Cvar_Get("gl_round_down", "1", 0);
gl_picmip = ri.Cvar_Get("gl_picmip", "0", 0);

4
src/client/refresh/gl/r_surf.c
View file

@ -317,7 +317,7 @@ R_BlendLightmaps(void)
}
/* render dynamic lightmaps */
if (gl_dynamic->value)
if (gl1_dynamic->value)
{
LM_InitBlock();
@ -502,7 +502,7 @@ R_RenderBrushPoly(msurface_t *fa)
{
dynamic:
if (gl_dynamic->value)
if (gl1_dynamic->value)
{
if (!(fa->texinfo->flags &
(SURF_SKY | SURF_TRANS33 |

6
src/client/refresh/gl3/gl3_main.c
View file

@ -124,8 +124,6 @@ cvar_t *gl_lightmap;
cvar_t *gl_shadows;
// no gl_stencilshadows, always use stencil (if available)
cvar_t *gl_dynamic;
cvar_t *gl3_debugcontext;
// Yaw-Pitch-Roll
@ -243,9 +241,6 @@ GL3_Register(void)
r_speeds = ri.Cvar_Get("r_speeds", "0", 0);
gl_finish = ri.Cvar_Get("gl_finish", "0", CVAR_ARCHIVE);
gl_dynamic = ri.Cvar_Get("gl_dynamic", "1", 0);
#if 0 // TODO!
//gl_lefthand = ri.Cvar_Get("hand", "0", CVAR_USERINFO | CVAR_ARCHIVE);
//gl_farsee = ri.Cvar_Get("gl_farsee", "0", CVAR_LATCH | CVAR_ARCHIVE);
@ -272,7 +267,6 @@ GL3_Register(void)
//gl_lightmap = ri.Cvar_Get("gl_lightmap", "0", 0);
//gl_shadows = ri.Cvar_Get("gl_shadows", "0", CVAR_ARCHIVE);
//gl_stencilshadow = ri.Cvar_Get("gl_stencilshadow", "0", CVAR_ARCHIVE);
//gl_dynamic = ri.Cvar_Get("gl_dynamic", "1", 0);
//gl_nobind = ri.Cvar_Get("gl_nobind", "0", 0);
gl_round_down = ri.Cvar_Get("gl_round_down", "1", 0);
gl_picmip = ri.Cvar_Get("gl_picmip", "0", 0);

2
src/client/refresh/gl3/header/local.h
View file

@ -514,8 +514,6 @@ extern cvar_t *gl_modulate;
extern cvar_t *gl_lightmap;
extern cvar_t *gl_shadows;
extern cvar_t *gl_dynamic;
extern cvar_t *gl3_debugcontext;
#endif /* SRC_CLIENT_REFRESH_GL3_HEADER_LOCAL_H_ */

3
src/common/cvar.c
View file

@ -51,7 +51,8 @@ replacement_t replacements[] = {
{"gl_hudscale", "r_hudscale"},
{"gl_menuscale", "r_scale"},
{"gl_customheight", "r_customheight"},
{"gl_customwidth", "r_customheight"}
{"gl_customwidth", "r_customheight"},
{"gl_dynamic", "gl1_dynamic"}
};