mirror of
https://git.code.sf.net/p/quake/nuq
synced 2024-11-25 21:41:48 +00:00
gl_part.c:
do the GL_BLEND thing for R_UpdateFires. Fires just don't look so good without it :/ model.c: correct some "spelling" mistakes.
This commit is contained in:
parent
1ff9c694dd
commit
f698534b79
2 changed files with 5 additions and 3 deletions
|
@ -340,6 +340,7 @@ R_UpdateFires (void)
|
||||||
glDepthMask (0);
|
glDepthMask (0);
|
||||||
glDisable (GL_TEXTURE_2D);
|
glDisable (GL_TEXTURE_2D);
|
||||||
glShadeModel (GL_SMOOTH);
|
glShadeModel (GL_SMOOTH);
|
||||||
|
glEnable (GL_BLEND);
|
||||||
glBlendFunc (GL_ONE, GL_ONE);
|
glBlendFunc (GL_ONE, GL_ONE);
|
||||||
|
|
||||||
f = r_fires;
|
f = r_fires;
|
||||||
|
@ -352,6 +353,7 @@ R_UpdateFires (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
glColor3f (1.0, 1.0, 1.0);
|
glColor3f (1.0, 1.0, 1.0);
|
||||||
|
glDisable (GL_BLEND);
|
||||||
glEnable (GL_TEXTURE_2D);
|
glEnable (GL_TEXTURE_2D);
|
||||||
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
glDepthMask (1);
|
glDepthMask (1);
|
||||||
|
|
|
@ -85,7 +85,7 @@ mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
|
||||||
if (node->contents < 0)
|
if (node->contents < 0)
|
||||||
return (mleaf_t *)node;
|
return (mleaf_t *)node;
|
||||||
plane = node->plane;
|
plane = node->plane;
|
||||||
d = DotProduct (p,plane->normal) - plane->dist;
|
d = DotProduct (p, plane->normal) - plane->dist;
|
||||||
if (d > 0)
|
if (d > 0)
|
||||||
node = node->children[0];
|
node = node->children[0];
|
||||||
else
|
else
|
||||||
|
@ -175,7 +175,7 @@ model_t *Mod_FindName (char *name)
|
||||||
model_t *mod;
|
model_t *mod;
|
||||||
|
|
||||||
if (!name[0])
|
if (!name[0])
|
||||||
Sys_Error ("Mod_ForName: NULL name");
|
Sys_Error ("Mod_FindName: NULL name");
|
||||||
|
|
||||||
//
|
//
|
||||||
// search the currently loaded models
|
// search the currently loaded models
|
||||||
|
@ -228,7 +228,7 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
|
||||||
if (!buf)
|
if (!buf)
|
||||||
{
|
{
|
||||||
if (crash)
|
if (crash)
|
||||||
Sys_Error ("Mod_NumForName: %s not found", mod->name);
|
Sys_Error ("Mod_LoadModel: %s not found", mod->name);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue