[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.382,1.383

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30484

Modified Files:
	scumm.h 
Log Message:
turn illegal SCUMM var access into an error

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -d -r1.382 -r1.383
--- scumm.h	15 Mar 2004 03:33:08 -0000	1.382
+++ scumm.h	15 Mar 2004 03:36:18 -0000	1.383
@@ -402,19 +402,14 @@
 	int32& scummVar(byte var, const char *varName, const char *file, int line)
 	{
 		if (var == 0xFF) {
-			warning("Illegal access to variable %s in file %s, line %d", varName, file, line);
-			// Return a fake memory location, so that at least no innocent variable
-			// gets overwritten.
-			static int32 fake;
-			fake = 0;
-			return fake;
+			error("Illegal access to variable %s in file %s, line %d", varName, file, line);
 		}
 		return _scummVars[var];
 	}
 	int32 scummVar(byte var, const char *varName, const char *file, int line) const
 	{
 		if (var == 0xFF) {
-			warning("Illegal access to variable %s in file %s, line %d", varName, file, line);
+			error("Illegal access to variable %s in file %s, line %d", varName, file, line);
 		}
 		return _scummVars[var];
 	}