Even more conversion, lots of superfluous macro removal
This commit is contained in:
+6
-5
@@ -221,7 +221,7 @@ void Sky_LoadSkyBox (const char *name)
|
||||
int i, mark, width, height;
|
||||
char filename[MAX_OSPATH];
|
||||
byte *data;
|
||||
qboolean nonefound = true;
|
||||
bool nonefound = true;
|
||||
|
||||
if (strcmp(skybox_name, name) == 0)
|
||||
return; //no change
|
||||
@@ -502,7 +502,7 @@ static void Sky_ClipPoly (int nump, vec3_t vecs, int stage)
|
||||
{
|
||||
const float *norm;
|
||||
float *v;
|
||||
qboolean front, back;
|
||||
bool front, back;
|
||||
float d, e;
|
||||
int newc[2];
|
||||
int i, j;
|
||||
@@ -680,7 +680,7 @@ void Sky_ProcessEntities (void)
|
||||
glpoly_t *p;
|
||||
int i,j,k,mark;
|
||||
float dot;
|
||||
qboolean rotated;
|
||||
bool rotated;
|
||||
vec3_t temp, forward, right, up;
|
||||
|
||||
if (!r_drawentities.value)
|
||||
@@ -838,7 +838,7 @@ void Sky_DrawSkyBox (void)
|
||||
c = Fog_GetColor();
|
||||
glEnable (GL_BLEND);
|
||||
glDisable (GL_TEXTURE_2D);
|
||||
glColor4f (c[0],c[1],c[2], CLAMP(0.0f,skyfog,1.0f));
|
||||
glColor4f (c[0],c[1],c[2], std::clamp(skyfog,0.0f, 1.0f));
|
||||
|
||||
glBegin (GL_QUADS);
|
||||
Sky_EmitSkyBoxVertex (skymins[0][i], skymins[1][i], i);
|
||||
@@ -989,12 +989,13 @@ void Sky_DrawFaceQuad (glpoly_t *p)
|
||||
c = Fog_GetColor();
|
||||
glEnable (GL_BLEND);
|
||||
glDisable (GL_TEXTURE_2D);
|
||||
glColor4f (c[0],c[1],c[2], CLAMP(0.0f,skyfog,1.0f));
|
||||
glColor4f (c[0],c[1],c[2], std::clamp(skyfog,0.0f, 1.0f));
|
||||
|
||||
glBegin (GL_QUADS);
|
||||
for (i=0, v=p->verts[0] ; i<4 ; i++, v+=VERTEXSIZE)
|
||||
glVertex3fv (v);
|
||||
glEnd ();
|
||||
|
||||
|
||||
glColor3f (1, 1, 1);
|
||||
glEnable (GL_TEXTURE_2D);
|
||||
|
||||
Reference in New Issue
Block a user