Fixes and modifications ...

- multiple fixes to bgLex
- G_LoadLocationsFile is now using bgLex instead of com_parse:
- this also allows LocationsList version 1 and 2 features to be mixed in
a location file

code/game/bg_lex.h

@@ -3,6 +3,11 @@
 
 #include "q_shared.h"
 
+#define LEX_DEBUG
+#ifdef LEX_DEBUG
+extern char *yyget_text (void* yyscanner);
+#endif
+
 typedef enum {
 	LSYM_OBRACE,		/* ( */
 	LSYM_OBRACEC,		/* { */
@@ -77,6 +82,7 @@ typedef enum {
 	LSYM_BOLT_MODEL,
 	LSYM_BOLT_SHADER,
 	LSYM_ADMIRAL_RANK,
+	LSYM_SEMICOLON,
 
 	LSYM_UNKNOWN
 } bgLexSymbol;

code/game/bg_lex.lex

@@ -7,8 +7,8 @@
 }
 
 DIGIT [0-9]
-INT {DIGIT}+
+INT "-"?{DIGIT}+
-DOUBLE {DIGIT}+"."?{DIGIT}*
+DOUBLE "-"?{DIGIT}+"."?{DIGIT}*
 KEYWORD [a-zA-Z]+[a-zA-Z0-9]*
 
 %option reentrant
@@ -124,6 +124,87 @@ KEYWORD [a-zA-Z]+[a-zA-Z0-9]*
 	yyextra->type = LMT_VECTOR3;
 	return LMT_VECTOR3;
 }
+"{"" "+{INT}" "*","" "+{INT}" "*","" "+{INT}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+
+"{"" "+{INT}" "*","" "+{INT}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+"{"" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{INT}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+"{"" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+"{"" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{INT}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+"{"" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+"{"" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{INT}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
+"{"" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c;
+	sscanf(yytext, "{ %lf, %lf, %lf }", &a, &b, &c);
+	yyextra->data.vector3[0] = a;
+	yyextra->data.vector3[1] = b;
+	yyextra->data.vector3[2] = c;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR3;
+	return LMT_VECTOR3;
+}
 "{"" "+{INT}" "+{INT}" "+{INT}" "+{INT}" "+"}" {
 	double a, b, c, d;
 	sscanf(yytext, "{ %lf %lf %lf %lf }", &a, &b, &c, &d);
@@ -300,6 +381,182 @@ KEYWORD [a-zA-Z]+[a-zA-Z0-9]*
 	yyextra->type = LMT_VECTOR4;
 	return LMT_VECTOR4;
 }
+"{"" "+{INT}" "*","" "+{INT}" "*","" "+{INT}" "*","" "+{INT}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{INT}" "*","" "+{INT}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{INT}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "+"}" { 
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{INT}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{INT}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{INT}" "*","" "+{INT}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{INT}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{INT}" "+"}" { 
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{INT}" "+"}" { 
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{INT}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{INT}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
+"{"" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "*","" "+{DOUBLE}" "+"}" {
+	double a, b, c, d;
+	sscanf(yytext, "{ %lf, %lf, %lf, %lf }", &a, &b, &c, &d);
+	yyextra->data.vector4[0] = a;
+	yyextra->data.vector4[1] = b;
+	yyextra->data.vector4[2] = c;
+	yyextra->data.vector4[3] = d;
+	yyextra->column += strlen(yytext);
+	yyextra->type = LMT_VECTOR4;
+	return LMT_VECTOR4;
+}
 "{" {
 	yyextra->type = LMT_SYMBOL;
 	yyextra->data.symbol = LSYM_OBRACEC;
@@ -336,20 +593,27 @@ KEYWORD [a-zA-Z]+[a-zA-Z0-9]*
 	yyextra->column++;
 	return LMT_SYMBOL;
 }
+";" {
+	yyextra->type = LMT_SYMBOL;
+	yyextra->data.symbol = LSYM_SEMICOLON;
+	yyextra->column++;
+	return LMT_SYMBOL;
+}
 [ \t] {
 	yyextra->column++;
 	yyextra->type = LMT_IGNORE;
-	return LMT_SYMBOL;
+	return LMT_IGNORE;
 }
 \n {
 	yyextra->line++;
+	yyextra->column = 0;
 	yyextra->type = LMT_IGNORE;
-	return LMT_SYMBOL;
+	return LMT_IGNORE;
 }
 . {
 	yyextra->column++;
 	yyextra->type = LMT_IGNORE;
-	return LMT_SYMBOL;
+	return LMT_IGNORE;
 }
 %%
 
@@ -389,6 +653,9 @@ bgLex* bgLex_create(char* data) {
 			return NULL;
 		}
 
+		l->morphem->line = 0;
+		l->morphem->column = 0;
+
 		yylex_init_extra(l->morphem, &l->lex);
 		l->buf = yy_scan_string(data,l->lex);
 	}

code/game/g_main.c

@@ -946,10 +946,6 @@ static void G_LoadTimedMessages(void) {
 	}
 
 	while(bgLex_lex(lexer)) {
-		if(lexer->morphem->type == LMT_IGNORE) {
-			continue;
-		}
-
 		if(lexer->morphem->type == LMT_STRING) {
 			level.timedMessages->append(level.timedMessages, lexer->morphem->data.str, LT_STRING, strlen(lexer->morphem->data.str));
 		} else {
@@ -1296,13 +1292,13 @@ static void G_LoadLocationsFile( void )
 	char			mapRoute[MAX_QPATH];
 	char			*serverInfo;
 	fileHandle_t	f;
+	bgLex*			lex;
 	char			*buffer;
 	int				file_len;
-	char			*textPtr, *token;
 	vec3_t			origin, angles;
 	gentity_t		*ent;
 	char			*desc;
-	int				rest;
+	int				rest = 0;
 
 	serverInfo = (char *)malloc(MAX_INFO_STRING * sizeof(char));
 	if(!serverInfo) {
@@ -1346,173 +1342,142 @@ static void G_LoadLocationsFile( void )
 
 	G_Printf( "Locations file %s located. Proceeding to load scan data.\n", fileRoute ); //GSIO01: why did this say "Usables file ..."? lol ;)
 
-	COM_BeginParseSession();
+	lex = bgLex_create(buffer);
-	textPtr = buffer;
+	if(lex == NULL) {
+		G_Printf(S_COLOR_RED "ERROR: Could not create bgLex to lex locations file.\n");
+		free(buffer);
+		return;
+	}
 
-	while( 1 )
+	if(bgLex_lex(lex) != LMT_SYMBOL) {
-	{
+		G_Printf(S_COLOR_RED "ERROR: Expected locations file to begin with 'LocationsList' or 'LocationsList2'.\n");
-		token = COM_Parse( &textPtr );
+		free(buffer);
-		if ( !token[0] )
+		bgLex_destroy(lex);
-			break;
+		return;
+	}
 
-		if(!Q_strncmp( token, "LocationsList2", 19 )) { // new style locations list with restricted locations
+	if(lex->morphem->data.symbol == LSYM_LOCATIONS_LIST || lex->morphem->data.symbol == LSYM_LOCATIONS_LIST_2) {
-			token = COM_Parse( &textPtr );
+		if(bgLex_lex(lex) == LMT_SYMBOL && lex->morphem->data.symbol == LSYM_OBRACEC) {
-			if ( Q_strncmp( token, "{", 1 ) != 0 )
+			if(!bgLex_lex(lex)) {
-			{
+				G_Printf(S_COLOR_RED "ERROR: Unexpected end of file.\n");
-				G_Printf( S_COLOR_RED "ERROR: LocationsList2 had no opening brace ( { )!\n" );
+				free(buffer);
-				continue;
+				bgLex_destroy(lex);
+				return;
+			}
+		} else {
+			G_Printf(S_COLOR_YELLOW "WARNING: LocationsList2 had no opening brace '{'!\n");
+		}
+
+		while(1) {
+			if(lex->morphem->type == LMT_SYMBOL && lex->morphem->data.symbol == LSYM_CBRACEC) {
+				break;
 			}
 
-			//expected format is "<origin> <angle> <int> <string>"
+			if(lex->morphem->type == LMT_VECTOR3) {
-			while ( Q_strncmp( token, "}", 1 ) )
+				VectorCopy(lex->morphem->data.vector3, origin);
-			{
+			} else {
-				if ( !token[0] )
+				G_Printf(S_COLOR_RED "ERROR: Expected vector at %d:%d.\n", lex->morphem->line, lex->morphem->column);
-					break;
+				free(buffer);
-
+				bgLex_destroy(lex);
-				//Parse origin
+				return;
-				if ( COM_ParseVec3( &textPtr, origin ) )
-				{
-					G_Printf( S_COLOR_RED "Invalid origin entry in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				//Parse angles
-				if ( COM_ParseVec3( &textPtr, angles ) )
-				{
-					G_Printf( S_COLOR_RED "Invalid origin entry in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				//Pars restriction value
-				if( COM_ParseInt( &textPtr, &rest ) )
-				{
-					G_Printf( S_COLOR_RED "Invalid restriction entry in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				//Parse Location string
-				token = COM_ParseExt( &textPtr, qfalse );
-				if ( !token[0] )
-				{
-					G_Printf( S_COLOR_RED "Invalid string desc entry in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				desc = token;
-
-				//create a new entity
-				ent = G_Spawn();
-				if ( !ent )
-				{
-					G_Printf( S_COLOR_RED "Couldn't create entity in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				ent->classname = "target_location";
-
-				//copy position data
-				VectorCopy( origin, ent->s.origin );
-				VectorCopy( angles, ent->s.angles );
-
-				//copy string
-				ent->message = G_NewString( desc );
-
-				//copy desc into target as well
-				ent->target = ent->targetname = G_NewString( desc );
-
-				// copy restriction value
-				ent->sound1to2 = rest;
-
-				//initiate it as a location ent
-				SP_target_location( ent );
-
-				//reset the ent
-				ent = NULL;
-
-				//--
-				token = COM_Parse( &textPtr );
-			}
-		} else if ( !Q_strncmp( token, "LocationsList", 18 ) ) // old stly locations file
-		{
-			token = COM_Parse( &textPtr );
-			if ( Q_strncmp( token, "{", 1 ) != 0 )
-			{
-				G_Printf( S_COLOR_RED "ERROR: LocationsList had no opening brace ( { )!\n" );
-				continue;
 			}
 
-			//expected format is "<origin> <angle> <string>"
+			if(bgLex_lex(lex) == LMT_VECTOR3) {
-			while ( Q_strncmp( token, "}", 1 ) )
+				VectorCopy(lex->morphem->data.vector3, angles);
+			} else {
+				G_Printf(S_COLOR_RED "ERROR: Expected vector at %d:%d.\n", lex->morphem->line, lex->morphem->column);
+				free(buffer);
+				bgLex_destroy(lex);
+				return;
+			}
+
+			if(bgLex_lex(lex) == LMT_STRING) {
+				int result;
+
+				desc = G_NewString(lex->morphem->data.str);
+
+				if((result = bgLex_lex(lex)) == LMT_STRING) {
+					rest = atoi(desc);
+					desc = G_NewString(lex->morphem->data.str);
+
+					if(!bgLex_lex(lex)) {
+						G_Printf(S_COLOR_RED "ERROR: Unexpected end of file.\n");
+						free(buffer);
+						bgLex_destroy(lex);
+						return;
+					}
+				} else {
+					if(!result) {
+						G_Printf(S_COLOR_RED "ERROR: Unexpected end of file.\n");
+						free(buffer);
+						bgLex_destroy(lex);
+						return;
+					}
+				}
+			} else {
+				G_Printf(S_COLOR_RED "ERROR: Expected string at %d:%d.\n", lex->morphem->line, lex->morphem->column);
+				free(buffer);
+				bgLex_destroy(lex);
+				return;
+			}
+
+			//create a new entity
+			ent = G_Spawn();
+			if ( !ent )
 			{
-				if ( !token[0] )
+				G_Printf( S_COLOR_RED "Couldn't create entity in %s!\n", fileRoute );
-					break;
+				free(buffer);
+				bgLex_destroy(lex);
+				return;
+			}
 
-				//Parse origin
+			ent->classname = "target_location";
-				if ( COM_ParseVec3( &textPtr, origin ) )
+
-				{
+			//copy position data
-					G_Printf( S_COLOR_RED "Invalid origin entry in %s!\n", fileRoute );
+			VectorCopy( origin, ent->s.origin );
+			VectorCopy( angles, ent->s.angles );
+
+			//copy string
+			ent->message = G_NewString( desc );
+
+			//copy desc into target as well
+			ent->target = ent->targetname = G_NewString( desc );
+
+			// copy restriction value
+			ent->sound1to2 = rest;
+
+			//initiate it as a location ent
+			SP_target_location( ent );
+
+			//reset the ent
+			ent = NULL;
+			rest = 0;
+
+			if(lex->morphem->type == LMT_SYMBOL && lex->morphem->data.symbol == LSYM_SEMICOLON) {
+				if(!bgLex_lex(lex)) {
+					G_Printf(S_COLOR_RED "ERROR: Unexpected end of file.\n");
 					free(buffer);
+					bgLex_destroy(lex);
 					return;
 				}
-
+			} else {
-				//Parse angles
+				G_Printf(S_COLOR_YELLOW "WARNING: Missing ';' at %d:%d.\n", lex->morphem->line, lex->morphem->column);
-				if ( COM_ParseVec3( &textPtr, angles ) )
-				{
-					G_Printf( S_COLOR_RED "Invalid origin entry in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				//Parse Location string
-				token = COM_ParseExt( &textPtr, qfalse );
-				if ( !token[0] )
-				{
-					G_Printf( S_COLOR_RED "Invalid string desc entry in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				desc = token;
-
-				//create a new entity
-				ent = G_Spawn();
-				if ( !ent )
-				{
-					G_Printf( S_COLOR_RED "Couldn't create entity in %s!\n", fileRoute );
-					free(buffer);
-					return;
-				}
-
-				ent->classname = "target_location";
-
-				//copy position data
-				VectorCopy( origin, ent->s.origin );
-				VectorCopy( angles, ent->s.angles );
-
-				//copy string
-				ent->message = G_NewString( desc );
-
-				//copy desc into target as well
-				ent->target = ent->targetname = G_NewString( desc );
-
-				//initiate it as a location ent
-				SP_target_location( ent );
-
-				//reset the ent
-				ent = NULL;
-
-				//--
-				token = COM_Parse( &textPtr );
 			}
 		}
+	} else {
+		G_Printf(S_COLOR_RED "ERROR: Unexpected token at %s:%d:%d. ", fileRoute, lex->morphem->line, lex->morphem->column);
+		G_Printf(S_COLOR_RED "Expected 'LocationsList' or 'LocationsList2'.\n");
+		free(buffer);
+		bgLex_destroy(lex);
+		return;
+	}
+
+	if(lex->morphem->type != LMT_SYMBOL || lex->morphem->data.symbol != LSYM_CBRACEC) {
+		G_Printf(S_COLOR_YELLOW "WARNING: Missing closing brace '}'!\n");
 	}
 
 	free(buffer);
+	bgLex_destroy(lex);
 }
 
 #define MAX_GROUP_FILE_SIZE	5000