[Scummvm-cvs-logs] CVS: scummvm/sword2 resman.cpp,1.80,1.81

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Jan 3 06:50:12 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv17692

Modified Files:
	resman.cpp 
Log Message:
It was pointed out to me that we can't use the DEMO variable here, because
the missing file may be the one with the resource for the global variables.


Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- resman.cpp	29 Dec 2003 15:30:10 -0000	1.80
+++ resman.cpp	3 Jan 2004 14:49:52 -0000	1.81
@@ -431,7 +431,7 @@
 			// playing a demo, then we're in trouble if the file
 			// can't be found!
 
-			if (DEMO || (_cdTab[parent_res_file] & LOCAL_PERM))
+			if ((_vm->_features & GF_DEMO) || (_cdTab[parent_res_file] & LOCAL_PERM))
 				error("Could not find '%s'", _resourceFiles[parent_res_file]);
 
 			getCd(_cdTab[parent_res_file] & 3);





More information about the Scummvm-git-logs mailing list