remove templights change

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index be3c12c8a816a51817b72751be8a19e9318d9a6b..4d9b71b8cca0a79804ab1e25440afd0a6cb86571 100644 (file)
--- a/console.c
+++ b/console.c
@@ -917,7 +917,7 @@ static char Sys_Con_NearestColor(const unsigned char _r, const unsigned char _g,
                h = (int)(60.0 * (g-b)/(max-min))%360;
        else if(max == g)
                h = (int)(60.0 * (b-r)/(max-min) + 120);
-       else if(max == b)
+       else // if(max == b) redundant check
                h = (int)(60.0 * (r-g)/(max-min) + 240);
 
        if(h < 36) // *red* to orange
@@ -1167,6 +1167,10 @@ void Con_Print(const char *msg)
                                                                                        in+=4;
                                                                                        break;
                                                                                }
+                                                                               *out++ = STRING_COLOR_TAG;
+                                                                               *out++ = STRING_COLOR_RGB_DEFAULT;
+                                                                               ++in;
+                                                                               break;
                                                                        /*case 'a':
                                                                                if ( isxdigit(in[2]) || in[2] == '+' || in[2] == '-' )
                                                                                {
@@ -1812,8 +1816,8 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
                                        if (com_token[0] == '}')
                                                break;
                                        // skip leading whitespace
-                                       for (k = 0;com_token[k] && com_token[k] <= ' ';k++);
-                                       for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && com_token[k+l] > ' ';l++)
+                                       for (k = 0;com_token[k] && ISWHITESPACE(com_token[k]);k++);
+                                       for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && !ISWHITESPACE(com_token[k+l]);l++)
                                                keyname[l] = com_token[k+l];
                                        keyname[l] = 0;
                                        if (!COM_ParseToken_Simple(&data, false, false))
@@ -2344,11 +2348,13 @@ int Nicks_AddLastColor(char *buffer, int pos)
                                else if(buffer[match+1] == STRING_COLOR_RGB_DEFAULT)
                                {
                                        if ( isxdigit(buffer[match+2]) && isxdigit(buffer[match+3]) && isxdigit(buffer[match+4]) )
+                                       {
                                                r = buffer[match+2];
                                                g = buffer[match+3];
                                                b = buffer[match+4];
                                                color = -1;
                                                break;
+                                       }
                                }
                        }
                }