[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.146,2.147 script_v7he.cpp,2.151,2.152

[kirben]

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

Modified Files:
	script_v100he.cpp script_v7he.cpp 
Log Message:

Missed one section.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.146
retrieving revision 2.147
diff -u -d -r2.146 -r2.147
--- script_v100he.cpp	7 May 2005 07:57:57 -0000	2.146
+++ script_v100he.cpp	7 May 2005 08:10:23 -0000	2.147
@@ -1102,6 +1102,10 @@
 		break;
 	case 136:
 		// Queue loading
+		if (_heResType == rtScript && _heResId >= _numGlobalScripts)
+			break;
+
+		ensureResourceLoaded(_heResType, _heResId);
 		break;
 	case 137:
 		if (_heResType == rtScript && _heResId >= _numGlobalScripts)

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.151
retrieving revision 2.152
diff -u -d -r2.151 -r2.152
--- script_v7he.cpp	7 May 2005 07:57:57 -0000	2.151
+++ script_v7he.cpp	7 May 2005 08:10:23 -0000	2.152
@@ -512,7 +512,6 @@
 
 	subOp = fetchScriptByte();
 
-	debug(0, "o70_resourceRoutines: case %d", subOp);
 	switch (subOp) {
 	case 100:		// SO_LOAD_SCRIPT
 		resid = pop();
@@ -606,6 +605,8 @@
 	case 120:
 		// Queue load script
 		resid = pop();
+		if (resid >= _numGlobalScripts)
+			break;
 		ensureResourceLoaded(rtScript, resid);
 		break;
 	case 121: