Fix R_GetEntityToken ending prematurely

If spawn var key or value is "" it caused R_GetEntityToken (available to cgame, used by opengl2) to stop parsing, whereas game VM would continue. Changed it to match parsing used for game VM (see G_GET_ENTITY_TOKEN in code/server/sv_game.c). The map poq3dm5 has a "wait" key with value "".
ioquake · Mar 10, 2014 · c8c7bb1 · c8c7bb1
1 parent 5a3e10d
commit c8c7bb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
@@ -1776,7 +1776,7 @@ qboolean R_GetEntityToken( char *buffer, int size ) {
 
 	s = COM_Parse( &s_worldData.entityParsePoint );
 	Q_strncpyz( buffer, s, size );
-	if ( !s_worldData.entityParsePoint || !s[0] ) {
+	if ( !s_worldData.entityParsePoint && !s[0] ) {
 		s_worldData.entityParsePoint = s_worldData.entityString;
 		return qfalse;
 	} else {

diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
@@ -2722,7 +2722,7 @@ qboolean R_GetEntityToken( char *buffer, int size ) {
 
 	s = COM_Parse( &s_worldData.entityParsePoint );
 	Q_strncpyz( buffer, s, size );
-	if ( !s_worldData.entityParsePoint || !s[0] ) {
+	if ( !s_worldData.entityParsePoint && !s[0] ) {
 		s_worldData.entityParsePoint = s_worldData.entityString;
 		return qfalse;
 	} else {