[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.80,1.81

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17830

Modified Files:
	resource.cpp 
Log Message:
make gui work if the requested string vars don't exist

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- resource.cpp	18 May 2003 21:03:56 -0000	1.80
+++ resource.cpp	19 May 2003 08:42:10 -0000	1.81
@@ -1268,7 +1268,10 @@
 
 	addr = getResourceAddress(rtString, _scummVars[i]);
 	if (addr == NULL)
-		error("NULL string var %d slot %d", i, _scummVars[i]);
+		// as this is used for string mapping in the gui
+		// it must be allowed to return NULL
+		// error("NULL string var %d slot %d", i, _scummVars[i]);
+		return NULL;
 
 	if (_features & GF_NEW_OPCODES)
 		return ((ArrayHeader *)addr)->data;