[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.149,1.150 script_v6.cpp,1.301,1.302
Travis Howell
kirben at users.sourceforge.net
Sun Feb 15 20:01:03 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv972/scumm
Modified Files:
script.cpp script_v6.cpp
Log Message:
Add comment and case
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- script.cpp 11 Feb 2004 05:38:15 -0000 1.149
+++ script.cpp 16 Feb 2004 03:53:03 -0000 1.150
@@ -840,8 +840,11 @@
void ScummEngine::killAllScriptsExceptCurrent() {
for (int i = 0; i < NUM_SCRIPT_SLOT; i++) {
- if (i != _currentScript)
+ if (i != _currentScript) {
vm.slot[i].status = ssDead;
+ if (_version == 6)
+ vm.slot[i].cutsceneOverride = 0;
+ }
}
}
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- script_v6.cpp 16 Feb 2004 03:08:17 -0000 1.301
+++ script_v6.cpp 16 Feb 2004 03:53:03 -0000 1.302
@@ -2599,7 +2599,7 @@
} else {
switch (args[0]) {
case 3:
- warning("o6_kernelSetFunctions: nothing in 3");
+ // Dummy case
break;
case 4:
grabCursor(args[1], args[2], args[3], args[4]);
@@ -2618,7 +2618,7 @@
startManiac();
break;
case 9:
- error("o6_kernelSetFunctions: stub9()");
+ killAllScriptsExceptCurrent();
break;
case 104: /* samnmax */
nukeFlObjects(args[2], args[3]);
More information about the Scummvm-git-logs
mailing list