X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=9fa0968825ec5e5297c814f5bdde49b7208ea842;hb=fae52291efa344ad98f83a13308ffa5dd583a11e;hp=c211044b8a09c6f4504bc2fbf333121770a7e661;hpb=6158e8a046495a1ca4fe265069b6f8defb925ba2;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index c211044b..9fa09688 100644
--- a/common.c
+++ b/common.c
@@ -643,7 +643,7 @@ void Com_HexDumpToConsole(const unsigned char *data, int size)
 					*cur++ = STRING_COLOR_TAG;
 					*cur++ = STRING_COLOR_TAG;
 				}
-				else if (d[j] >= ' ')
+				else if (d[j] >= (unsigned char) ' ')
 					*cur++ = d[j];
 				else
 					*cur++ = '.';
@@ -996,7 +996,7 @@ skipwhite:
 	// UNIX: \n
 	// Mac: \r
 	// Windows: \r\n
-	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
+	for (;ISWHITESPACE(*data) && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
 		if (*data == 0)
 		{
@@ -1072,7 +1072,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ';data++)
+		for (;!ISWHITESPACE(*data);data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -1109,7 +1109,7 @@ skipwhite:
 	// UNIX: \n
 	// Mac: \r
 	// Windows: \r\n
-	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
+	for (;ISWHITESPACE(*data) && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
 		if (*data == 0)
 		{
@@ -1186,7 +1186,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
+		for (;!ISWHITESPACE(*data) && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -1223,7 +1223,7 @@ skipwhite:
 	// UNIX: \n
 	// Mac: \r
 	// Windows: \r\n
-	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
+	for (;ISWHITESPACE(*data) && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
 		if (*data == 0)
 		{
@@ -1300,7 +1300,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ' && *data != ',' && *data != ';' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
+		for (;!ISWHITESPACE(*data) && *data != ',' && *data != ';' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -1332,7 +1332,7 @@ int COM_ParseToken_Console(const char **datapointer)
 
 // skip whitespace
 skipwhite:
-	for (;*data <= ' ';data++)
+	for (;ISWHITESPACE(*data);data++)
 	{
 		if (*data == 0)
 		{
@@ -1368,7 +1368,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ';data++)
+		for (;!ISWHITESPACE(*data);data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -1492,6 +1492,9 @@ static const gamemode_info_t gamemode_info [GAME_COUNT] =
 // GAME_PROPHECY
 // COMMANDLINEOPTION: Game: -prophecy runs the game Quake (default)
 { "prophecy",				"-prophecy",		"Prophecy",		"data",		NULL,			"prophecy",			"prophecy" },
+// GAME_BLOODOMNICIDE
+// COMMANDLINEOPTION: Game: -omnicide runs the game Blood Omnicide
+{ "omnicide", "-omnicide", "Blood Omnicide", "kain", NULL, "omnicide", "omnicide" },
 };
 
 void COM_InitGameType (void)
@@ -1623,7 +1626,11 @@ int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list ar
 {
 	int result;
 
+#if _MSC_VER >= 1400
+	result = _vsnprintf_s (buffer, buffersize, _TRUNCATE, format, args);
+#else
 	result = vsnprintf (buffer, buffersize, format, args);
+#endif
 	if (result < 0 || (size_t)result >= buffersize)
 	{
 		buffer[buffersize - 1] = '\0';
@@ -1689,7 +1696,7 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
 		commentprefixlength = (int)strlen(commentprefix);
 	while (*l && *l != '\n' && *l != '\r')
 	{
-		if (*l > ' ')
+		if (!ISWHITESPACE(*l))
 		{
 			if (commentprefixlength && !strncmp(l, commentprefix, commentprefixlength))
 			{
@@ -1714,7 +1721,7 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
 			}
 			else
 			{
-				while (*l > ' ')
+				while (!ISWHITESPACE(*l))
 				{
 					if (tokenbuf >= tokenbufend)
 						return -1;
@@ -1773,6 +1780,17 @@ COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid)
 				++s;
 				switch((s == end) ? 0 : *s)
 				{
+					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]) )
+						{
+							s+=3;
+							break;
+						}
+						++len; // STRING_COLOR_TAG
+						++len; // STRING_COLOR_RGB_TAG_CHAR
+						break;
 					case 0: // ends with unfinished color code!
 						++len;
 						if(valid)
@@ -1811,7 +1829,7 @@ for example).
 
 If the output buffer size did not suffice for converting, the function returns
 FALSE. Generally, if escape_carets is false, the output buffer needs
-strlen(str)+1 bytes, and if escape_carets is true, it can need strlen(str)+2
+strlen(str)+1 bytes, and if escape_carets is true, it can need strlen(str)*1.5+2
 bytes. In any case, the function makes sure that the resulting string is
 zero terminated.
 
@@ -1837,6 +1855,19 @@ 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_TAG_CHAR:
+						if (in+1 != end && isxdigit(in[1]) &&
+							in+2 != end && isxdigit(in[2]) &&
+							in+3 != end && isxdigit(in[3]) )
+						{
+							in+=3;
+							break;
+						}
+						APPEND(STRING_COLOR_TAG);
+						if(escape_carets)
+							APPEND(STRING_COLOR_TAG);
+						APPEND(STRING_COLOR_RGB_TAG_CHAR);
+						break;
 					case 0: // ends with unfinished color code!
 						APPEND(STRING_COLOR_TAG);
 						// finish the code by appending another caret when escaping
@@ -2026,7 +2057,7 @@ void InfoString_SetValue(char *buffer, size_t bufferlength, const char *key, con
 		// set the key/value and append the remaining text
 		char tempbuffer[4096];
 		strlcpy(tempbuffer, buffer + pos2, sizeof(tempbuffer));
-		sprintf(buffer + pos, "\\%s\\%s%s", key, value, tempbuffer);
+		dpsnprintf(buffer + pos, bufferlength - pos, "\\%s\\%s%s", key, value, tempbuffer);
 	}
 	else
 	{
@@ -2147,3 +2178,25 @@ strlcpy(char *dst, const char *src, size_t siz)
 }
 
 #endif  // #ifndef HAVE_STRLCPY
+
+void FindFraction(double val, int *num, int *denom, int denomMax)
+{
+	int i;
+	double bestdiff;
+	// initialize
+	bestdiff = fabs(val);
+	*num = 0;
+	*denom = 1;
+
+	for(i = 1; i <= denomMax; ++i)
+	{
+		int inum = (int) floor(0.5 + val * i);
+		double diff = fabs(val - inum / (double)i);
+		if(diff < bestdiff)
+		{
+			bestdiff = diff;
+			*num = inum;
+			*denom = i;
+		}
+	}
+}