nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 22:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bugs caused by last commit...

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2548 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2007-07-23 18:52:41 +00:00
parent 5fc1d3fdea
commit 856d1ca150
2 changed files with 4 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
engine/gl/gl_alias.c
View file

@ -1001,35 +1001,8 @@ static galiastexnum_t *GL_ChooseSkin(galiasinfo_t *inf, char *modelname, int sur
{ {
if (!e->scoreboard->skin) if (!e->scoreboard->skin)
Skin_Find(e->scoreboard); Skin_Find(e->scoreboard);
tc = e->scoreboard->topcolor; tc = e->scoreboard->ttopcolor;
bc = e->scoreboard->bottomcolor; bc = e->scoreboard->tbottomcolor;
//colour forcing
if (cl.splitclients<2 && !(cl.fpd & FPD_NO_FORCE_COLOR)) //no colour/skin forcing in splitscreen.
{
if (cl.teamplay && cl.spectator)
{
local = Cam_TrackNum(0);
if (local < 0)
local = cl.playernum[0];
}
else
local = cl.playernum[0];
if (cl.teamplay && !strcmp(e->scoreboard->team, cl.players[local].team))
{
if (cl_teamtopcolor>=0)
tc = cl_teamtopcolor;
if (cl_teambottomcolor>=0)
bc = cl_teambottomcolor;
}
else
{
if (cl_enemytopcolor>=0)
tc = cl_enemytopcolor;
if (cl_enemybottomcolor>=0)
bc = cl_enemybottomcolor;
}
}
} }
else else
{ {

32
engine/gl/gl_backend.c
View file

@ -285,21 +285,7 @@ void R_FetchTopColour(int *retred, int *retgreen, int *retblue)
int i; int i;
if (currententity->scoreboard) if (currententity->scoreboard)
{ {
i = currententity->scoreboard->topcolor; i = currententity->scoreboard->ttopcolor;
//colour forcing
if (cl.splitclients<2 && !(cl.fpd & FPD_NO_FORCE_COLOR)) //no colour/skin forcing in splitscreen.
{
if (cl.teamplay && !strcmp(currententity->scoreboard->team, cl.players[cl.playernum[0]].team))
{
if (cl_teamtopcolor>=0)
i = cl_teamtopcolor;
}
else
{
if (cl_enemytopcolor>=0)
i = cl_enemytopcolor;
}
}
} }
else else
i = TOP_RANGE>>4; i = TOP_RANGE>>4;
@ -328,21 +314,7 @@ void R_FetchBottomColour(int *retred, int *retgreen, int *retblue)
int i; int i;
if (currententity->scoreboard) if (currententity->scoreboard)
{ {
i = currententity->scoreboard->bottomcolor; i = currententity->scoreboard->tbottomcolor;
//colour forcing
if (cl.splitclients<2 && !(cl.fpd & FPD_NO_FORCE_COLOR)) //no colour/skin forcing in splitscreen.
{
if (cl.teamplay && !strcmp(currententity->scoreboard->team, cl.players[cl.playernum[0]].team))
{
if (cl_teambottomcolor>=0)
i = cl_teambottomcolor;
}
else
{
if (cl_enemybottomcolor>=0)
i = cl_enemybottomcolor;
}
}
} }
else else
i = BOTTOM_RANGE>>4; i = BOTTOM_RANGE>>4;