qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 14:42:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed some #ifdef and #ifundef's that didn't make much sense.

Browse source
This commit is contained in:
Eric Windisch 2000-01-02 02:52:38 +00:00
parent ca59cdb11b
commit 84d05a1c59
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/gl_rmain.c
View file

@ -86,10 +86,13 @@ cvar_t r_dynamic = {"r_dynamic","1"};
cvar_t r_novis = {"r_novis","0"}; cvar_t r_novis = {"r_novis","0"};
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
cvar_t r_netgraph = {"r_netgraph","0"}; cvar_t r_netgraph = {"r_netgraph","0"};
#else
cvar_t r_fog = {"r_fog", "0"};
#endif #endif
// All the fog code was disabled for QuakeWold
// _reduced_ visability shouldn't be considered cheating :)
cvar_t r_fog = {"r_fog", "0"};
cvar_t gl_finish = {"gl_finish","0"}; cvar_t gl_finish = {"gl_finish","0"};
cvar_t gl_clear = {"gl_clear","0"}; cvar_t gl_clear = {"gl_clear","0"};
cvar_t gl_cull = {"gl_cull","1"}; cvar_t gl_cull = {"gl_cull","1"};
@ -1157,10 +1160,8 @@ r_refdef must be set before the first call
void R_RenderView (void) void R_RenderView (void)
{ {
double time1 = 0, time2 = 0; double time1 = 0, time2 = 0;
#ifndef QUAKEWORLD
// Fixme: the last argument should be a cvar... r_fog_gamma // Fixme: the last argument should be a cvar... r_fog_gamma
GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.15}; GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.15};
#endif
if (r_norefresh.value) if (r_norefresh.value)
return; return;
@ -1184,8 +1185,6 @@ void R_RenderView (void)
R_Clear (); R_Clear ();
// render normal view // render normal view
#ifndef QUAKEWORLD
// XXX
/***** Experimental silly looking fog ****** /***** Experimental silly looking fog ******
****** Use r_fullbright if you enable ****** ****** Use r_fullbright if you enable ******
@ -1209,19 +1208,16 @@ if(r_fog.value) {
glFogf (GL_FOG_DENSITY, .0005); glFogf (GL_FOG_DENSITY, .0005);
glEnable(GL_FOG); glEnable(GL_FOG);
} }
#endif
R_RenderScene (); R_RenderScene ();
R_DrawViewModel (); R_DrawViewModel ();
R_DrawWaterSurfaces (); R_DrawWaterSurfaces ();
#ifndef QUAKEWORLD
// More fog right here :) // More fog right here :)
glDisable(GL_FOG); glDisable(GL_FOG);
// End of all fog code... // End of all fog code...
// render mirror view // render mirror view
R_Mirror (); R_Mirror ();
#endif
R_PolyBlend (); R_PolyBlend ();
if (r_speeds.value) if (r_speeds.value)