X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=c4461231503c32f80eb3ee79e5444b04a56618e5;hp=9520cb3f039ecb4c6fd12f09865eb5fb3d4c5869;hb=ef35a088cb3ab1900acdbd5285465cd845368e79;hpb=01e2d86178b9523fa75e106f2c844c8e45e300bf

diff --git a/common.c b/common.c
index 9520cb3f..c4461231 100644
--- a/common.c
+++ b/common.c
@@ -506,7 +506,7 @@ COM_ParseToken
 Parse a token out of a string
 ==============
 */
-int COM_ParseToken (const char **datapointer)
+int COM_ParseToken(const char **datapointer, int returnnewline)
 {
 	int c;
 	int len;
@@ -523,7 +523,7 @@ int COM_ParseToken (const char **datapointer)
 
 // skip whitespace
 skipwhite:
-	while ((c = *data) <= ' ')
+	while ((c = *data) <= ' ' && (c != '\n' || !returnnewline))
 	{
 		if (c == 0)
 		{
@@ -534,15 +534,25 @@ skipwhite:
 		data++;
 	}
 
-// skip // comments
-	if (c=='/' && data[1] == '/')
+	// check if it's a comment
+	if (c == '/')
 	{
-		while (*data && *data != '\n')
-			data++;
-		goto skipwhite;
+		// skip // comments
+		if (data[1] == '/')
+		{
+			while (*data && *data != '\n')
+				data++;
+			goto skipwhite;
+		}
+		// skip /* comments
+		if (data[1] == '*')
+		{
+			while (*data && *data != '*' && data[1] != '/')
+				data++;
+			goto skipwhite;
+		}
 	}
 
-
 // handle quoted strings specially
 	if (c == '\"')
 	{
@@ -550,7 +560,7 @@ skipwhite:
 		while (1)
 		{
 			c = *data++;
-			if (c=='\"' || !c)
+			if (c == '\"' || !c)
 			{
 				com_token[len] = 0;
 				*datapointer = data;
@@ -562,7 +572,7 @@ skipwhite:
 	}
 
 // parse single characters
-	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+	if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n')
 	{
 		com_token[len] = c;
 		len++;
@@ -578,7 +588,7 @@ skipwhite:
 		data++;
 		len++;
 		c = *data;
-		if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+		if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';')
 			break;
 	} while (c>32);