diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c index d4f314a00..d0d21b7ad 100644 --- a/engine/gl/gl_alias.c +++ b/engine/gl/gl_alias.c @@ -1001,35 +1001,8 @@ static galiastexnum_t *GL_ChooseSkin(galiasinfo_t *inf, char *modelname, int sur { if (!e->scoreboard->skin) Skin_Find(e->scoreboard); - tc = e->scoreboard->topcolor; - bc = e->scoreboard->bottomcolor; - - //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; - } - } + tc = e->scoreboard->ttopcolor; + bc = e->scoreboard->tbottomcolor; } else { diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c index 3878b40c9..b6ec98e7a 100644 --- a/engine/gl/gl_backend.c +++ b/engine/gl/gl_backend.c @@ -285,21 +285,7 @@ void R_FetchTopColour(int *retred, int *retgreen, int *retblue) int i; if (currententity->scoreboard) { - i = currententity->scoreboard->topcolor; - //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; - } - } + i = currententity->scoreboard->ttopcolor; } else i = TOP_RANGE>>4; @@ -328,21 +314,7 @@ void R_FetchBottomColour(int *retred, int *retgreen, int *retblue) int i; if (currententity->scoreboard) { - i = currententity->scoreboard->bottomcolor; - //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; - } - } + i = currententity->scoreboard->tbottomcolor; } else i = BOTTOM_RANGE>>4;