From 1686d30c166397db7b8daa5ac629ffdebe5123b0 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Mon, 10 Mar 2014 16:19:02 -0500
Subject: 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 "".
---
 src/renderergl1/tr_bsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/renderergl1')

diff --git a/src/renderergl1/tr_bsp.c b/src/renderergl1/tr_bsp.c
index bccc2ba2..bf4c7e31 100644
--- a/src/renderergl1/tr_bsp.c
+++ b/src/renderergl1/tr_bsp.c
@@ -1777,7 +1777,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 {
-- 
cgit