qf
/
newtree
mirror of https://git.code.sf.net/p/quake/newtree
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore old cshift powerup behavior for quad and invuln when using polyblends. Flicker was simply unbearable otherwise.

This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-02-03 04:02:39 +00:00
parent 759fa8dd5f
commit 4acdf6d3b2
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/gl_rlight.c
View File

@ -99,8 +99,8 @@ float bubble_sintable[33], bubble_costable[33];
void
R_InitBubble ()
{
float a;
int i;
float a;
float *bub_sin, *bub_cos;
bub_sin = bubble_sintable;
@ -117,7 +117,6 @@ void
R_RenderDlight (dlight_t *light)
{
int i, j;
vec3_t v;
float rad;
float *bub_sin, *bub_cos;
@ -125,36 +124,39 @@ R_RenderDlight (dlight_t *light)
bub_sin = bubble_sintable;
bub_cos = bubble_costable;
rad = light->radius * 0.35;
VectorSubtract (light->origin, r_origin, v);
if (Length (v) < rad) { // view is inside the dlight
AddLightBlend (light->color[0], light->color[1], light->color[2], light->radius * 0.0003);
return;
}
glBegin (GL_TRIANGLE_FAN);
if (lighthalf)
glColor3f (light->color[0] * 0.5, light->color[1] * 0.5,
light->color[2] * 0.5);
else
glColor3fv (light->color);
for (i = 0; i < 3; i++)
v[i] = light->origin[i] - vpn[i] * rad;
glVertex3fv (v);
glColor3f (0, 0, 0);
for (i = 16; i >= 0; i--) {
for (j = 0; j < 3; j++)
v[j] = light->origin[j] + (vright[j] * (*bub_cos) +
+vup[j] * (*bub_sin)) * rad;
vup[j] * (*bub_sin)) * rad;
bub_sin += 2;
bub_cos += 2;
glVertex3fv (v);
}
glEnd ();
// No, we don't reset here, we reset in the function which calls this
// one.
// Largely because this is called in a big loop.
// glColor3ubv(lighthalf_v);
// Don't glColor3ubv(lighthalf_v), as we reset in the function which
// calls this one, because this is called in a big loop.
}
/*

25
source/gl_view.c
View File

@ -124,8 +124,29 @@ V_CalcPowerupCshift (void)
|| (atoi (Info_ValueForKey (cl.serverinfo, "cshifts")) & INFO_CSHIFT_POWERUP))
return;
// Note that quad and pent are handled as dlights now. - Despair
if (cl.stats[STAT_ITEMS] & IT_SUIT) {
if ((gl_dlight_polyblend->int_val ||
!(gl_dlight_lightmap->int_val && gl_dlight_polyblend->int_val)) &&
(cl.stats[STAT_ITEMS] & IT_INVULNERABILITY ||
cl.stats[STAT_ITEMS] & IT_QUAD))
{
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY &&
cl.stats[STAT_ITEMS] & IT_QUAD) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else if (cl.stats[STAT_ITEMS] & IT_QUAD) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
}
} else if (cl.stats[STAT_ITEMS] & IT_SUIT) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;