team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing v_cshift with hardware gamma on winnt. winnt sucks. 

flashbangs are non-cheatie now.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@877 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-02-17 03:30:24 +00:00
parent b78f12477d
commit 9fbeb58384
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
engine/client/view.c
View File

@ -586,6 +586,31 @@ V_CalcBlend
=============
*/
#if defined(RGLQUAKE)
void GLV_CalcBlendServer (float colors[4])
{
extern qboolean gammaworks;
if (gammaworks || !v_blend[3])
{ //regular cshifts work through hardware gamma
//server sent cshifts do not.
colors[0] = cl.cshifts[CSHIFT_SERVER].destcolor[0]/255.0f;
colors[1] = cl.cshifts[CSHIFT_SERVER].destcolor[1]/255.0f;
colors[2] = cl.cshifts[CSHIFT_SERVER].destcolor[2]/255.0f;
colors[3] = cl.cshifts[CSHIFT_SERVER].percent/255.0f;
}
else
{
float na;
na = cl.cshifts[CSHIFT_SERVER].percent/255.0f;
colors[3] = v_blend[3] + na*(1-v_blend[3]);
//Con_Printf ("j:%i a:%f\n", j, a);
na = na/colors[3];
colors[0] = v_blend[0]*(1-na) + (cl.cshifts[CSHIFT_SERVER].destcolor[0]/255.0f)*na;
colors[1] = v_blend[1]*(1-na) + (cl.cshifts[CSHIFT_SERVER].destcolor[1]/255.0f)*na;
colors[2] = v_blend[2]*(1-na) + (cl.cshifts[CSHIFT_SERVER].destcolor[2]/255.0f)*na;
}
}
void GLV_CalcBlend (void)
{
float r, g, b, a, a2;
@ -596,19 +621,20 @@ void GLV_CalcBlend (void)
b = 0;
a = 0;
for (j=0 ; j<NUM_CSHIFTS ; j++)
//don't apply it to the server, we'll blend the two later if the user has no hardware gamma (if they do have it, we use just the server specified value) This way we avoid winnt users having a cheat with flashbangs and stuff.
for (j=0 ; j<CSHIFT_SERVER ; j++)
{
if (j != CSHIFT_SERVER)
{
// if (j != CSHIFT_SERVER)
// {
if (!gl_cshiftpercent.value || !gl_polyblend.value)
continue;
a2 = ((cl.cshifts[j].percent * gl_cshiftpercent.value) / 100.0) / 255.0;
}
else
{
a2 = cl.cshifts[j].percent / 255.0; //don't allow modification of this one.
}
// }
// else
// {
// a2 = cl.cshifts[j].percent / 255.0; //don't allow modification of this one.
// }
if (!a2)
continue;
@ -665,7 +691,7 @@ void GLV_UpdatePalette (void)
new = false;
for (i=0 ; i<NUM_CSHIFTS ; i++)
for (i=0 ; i<CSHIFT_SERVER ; i++)
{
if (cl.cshifts[i].percent != cl.prev_cshifts[i].percent)
{

10
engine/gl/gl_rmain.c
View File

@ -952,13 +952,17 @@ void GLR_DrawViewModel (void)
R_PolyBlend
============
*/
void GLV_CalcBlendServer (float colors[4]);
void R_PolyBlend (void)
{
float shift[4];
extern qboolean gammaworks;
if (!v_blend[3] || gammaworks)
if ((!v_blend[3] || gammaworks) && !cl.cshifts[CSHIFT_SERVER].percent)
return;
//Con_Printf("R_PolyBlend(): %4.2f %4.2f %4.2f %4.2f\n",v_blend[0], v_blend[1], v_blend[2], v_blend[3]);
GLV_CalcBlendServer(shift); //figure out the shift we need (normally just the server specified one)
//Con_Printf("R_PolyBlend(): %4.2f %4.2f %4.2f %4.2f\n",shift[0], shift[1], shift[2], shift[3]);
GL_DisableMultitexture();
@ -974,7 +978,7 @@ void R_PolyBlend (void)
qglRotatef (-90, 1, 0, 0); // put Z going up
qglRotatef (90, 0, 0, 1); // put Z going up
qglColor4fv (v_blend);
qglColor4fv (shift);
qglBegin (GL_QUADS);