[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.27,1.28 script_v8.cpp,2.44,2.45 scumm.h,1.104,1.105
Max Horn
fingolfin at users.sourceforge.net
Wed Dec 25 12:30:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4577
Modified Files:
script.cpp script_v8.cpp scumm.h
Log Message:
implemented V8 kernel function 'killAllScriptsButMe' - not sure if I did it right, though
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- script.cpp 25 Dec 2002 20:07:09 -0000 1.27
+++ script.cpp 25 Dec 2002 20:29:40 -0000 1.28
@@ -748,6 +748,14 @@
}
}
+void Scumm::killAllScriptsExceptCurrent()
+{
+ for (int i = 1; i < NUM_SCRIPT_SLOT; i++) {
+ if (i != _currentScript)
+ vm.slot[i].status = ssDead;
+ }
+}
+
void Scumm::checkAndRunSentenceScript()
{
int i;
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -d -r2.44 -r2.45
--- script_v8.cpp 25 Dec 2002 20:15:54 -0000 2.44
+++ script_v8.cpp 25 Dec 2002 20:29:40 -0000 2.45
@@ -1239,6 +1239,7 @@
break;
case 30: // killAllScriptsButMe
warning("o6_kernelSetFunctions: killAllScriptsButMe()");
+ killAllScriptsExceptCurrent();
break;
case 31: // stopAllVideo
warning("o6_kernelSetFunctions: stopAllVideo()");
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- scumm.h 25 Dec 2002 16:55:43 -0000 1.104
+++ scumm.h 25 Dec 2002 20:29:40 -0000 1.105
@@ -506,6 +506,7 @@
void beginOverride();
void endOverride();
+ void killAllScriptsExceptCurrent();
void killScriptsAndResources();
void checkAndRunSentenceScript();
void decreaseScriptDelay(int amount);
More information about the Scummvm-git-logs
mailing list