Actually fix color not being applied correctly

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12730 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index 05b11f42e491eeac52eb49991b42424c50013df7..9aa2d1397272b3375cd8cf5b5b40e34033c5fc16 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -231,6 +231,12 @@ static void CL_Color_f(cmd_state_t *cmd)
         * happens twice here. Perhaps find a cleaner way?
         */
 
+       top = top >= 0 ? bottom : topcolor.integer;
+       bottom = bottom >= 0 ? bottom : bottomcolor.integer;
+
+       top &= 15;
+       bottom &= 15;
+
        // LadyHavoc: allowing skin colormaps 14 and 15 by commenting this out
        //if (top > 13)
        //      top = 13;

diff --git a/sv_ccmds.c b/sv_ccmds.c
index e4b201b2033c60d4a383a472c5b145851032d2a6..015839f4943c6934728055961dacbe20a0f7f0ec 100644 (file)
--- a/sv_ccmds.c
+++ b/sv_ccmds.c
@@ -1095,6 +1095,9 @@ static void SV_Color_f(cmd_state_t *cmd)
        top = atoi(Cmd_Argv(cmd, 1));
        bottom = atoi(Cmd_Argv(cmd, 2));
 
+       top &= 15;
+       bottom &= 15;
+
        playercolor = top*16 + bottom;
 
        if (host_client->edict && PRVM_serverfunction(SV_ChangeTeam))