X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=e29a00ab4b44136e15d931d76be0f60ad412b1d6;hb=ee732892c6e3ca467914c77944199f479321190f;hp=c37055209bb261fb186cb9aa52418f19926b02f7;hpb=4afc8578d1934fafc515c720cacb37cccd5e01d8;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index c3705520..e29a00ab 100644
--- a/common.c
+++ b/common.c
@@ -1777,7 +1777,7 @@ COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid)
 				++s;
 				switch((s == end) ? 0 : *s)
 				{
-					case STRING_COLOR_RGB_DEFAULT:
+					case STRING_COLOR_RGB_TAG_CHAR:
 						if (s+1 != end && isxdigit(s[1]) &&
 							s+2 != end && isxdigit(s[2]) &&
 							s+3 != end && isxdigit(s[3]) )
@@ -1786,17 +1786,8 @@ COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid)
 							break;
 						}
 						++len; // STRING_COLOR_TAG
-						++len; // STRING_COLOR_RGB_DEFAULT
+						++len; // STRING_COLOR_RGB_TAG_CHAR
 						break;
-					/*case 'a':
-						if ( s+1 != end && ( isxdigit(s[1]) || (s[1] == '+' || s[1] == '-') ) )
-						{
-							s++;
-							break;
-						}
-						++len; // STRING_COLOR_TAG
-						++len; // STRING_COLOR_RGB_DEFAULT
-						break;*/
 					case 0: // ends with unfinished color code!
 						++len;
 						if(valid)
@@ -1861,7 +1852,7 @@ COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out,
 				++in;
 				switch((in == end) ? 0 : *in)
 				{
-					case STRING_COLOR_RGB_DEFAULT:
+					case STRING_COLOR_RGB_TAG_CHAR:
 						if (in+1 != end && isxdigit(in[1]) &&
 							in+2 != end && isxdigit(in[2]) &&
 							in+3 != end && isxdigit(in[3]) )
@@ -1872,14 +1863,8 @@ COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out,
 						APPEND(STRING_COLOR_TAG);
 						if(escape_carets)
 							APPEND(STRING_COLOR_TAG);
-						APPEND(STRING_COLOR_RGB_DEFAULT);
+						APPEND(STRING_COLOR_RGB_TAG_CHAR);
 						break;
-					/*case 'a':
-						if ( in+1 != end && ( isxdigit(in[1]) || (in[1] == '+' || in[1] == '-') ) )
-						{
-							in++;
-							break;
-						}*/
 					case 0: // ends with unfinished color code!
 						APPEND(STRING_COLOR_TAG);
 						// finish the code by appending another caret when escaping