[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.75,1.76

[Max Horn]

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

Modified Files:
	script.cpp 
Log Message:
some V2 fixes (we really really need to revise the _vars handling!)

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- script.cpp	5 May 2003 09:19:14 -0000	1.75
+++ script.cpp	8 May 2003 14:32:25 -0000	1.76
@@ -653,7 +653,7 @@
 }
 
 void Scumm::runExitScript() {
-	if (_vars[VAR_EXIT_SCRIPT])
+	if (!(_features & GF_AFTER_V2) && _vars[VAR_EXIT_SCRIPT])
 		runScript(_vars[VAR_EXIT_SCRIPT], 0, 0, 0);
 	if (_EXCD_offs) {
 		int slot = getScriptSlot();
@@ -684,12 +684,12 @@
 
 		runScriptNested(slot);
 	}
-	if (_vars[VAR_EXIT_SCRIPT2])
+	if (!(_features & GF_AFTER_V2) && _vars[VAR_EXIT_SCRIPT2])
 		runScript(_vars[VAR_EXIT_SCRIPT2], 0, 0, 0);
 }
 
 void Scumm::runEntryScript() {
-	if (_vars[VAR_ENTRY_SCRIPT])
+	if (!(_features & GF_AFTER_V2) && _vars[VAR_ENTRY_SCRIPT])
 		runScript(_vars[VAR_ENTRY_SCRIPT], 0, 0, 0);
 	if (_ENCD_offs) {
 		int slot = getScriptSlot();
@@ -703,7 +703,7 @@
 		vm.slot[slot].delayFrameCount = 0;
 		runScriptNested(slot);
 	}
-	if (_vars[VAR_ENTRY_SCRIPT2])
+	if (!(_features & GF_AFTER_V2) && _vars[VAR_ENTRY_SCRIPT2])
 		runScript(_vars[VAR_ENTRY_SCRIPT2], 0, 0, 0);
 }