[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.20,1.21
James Brown
ender at users.sourceforge.net
Sun Nov 10 04:23:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv28637/scumm
Modified Files:
script_v1.cpp
Log Message:
Implement Indy3 opcode - this fixes the 'walking to car' portion of the first section of the game
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- script_v1.cpp 10 Nov 2002 07:58:53 -0000 1.20
+++ script_v1.cpp 10 Nov 2002 12:22:22 -0000 1.21
@@ -680,7 +680,6 @@
delay |= fetchScriptByte() << 16;
vm.slot[_currentScript].delay = delay;
vm.slot[_currentScript].status = 1;
-
o5_breakHere();
}
@@ -1929,8 +1928,17 @@
int16 items[15];
int i;
- if (_features & GF_SMALL_HEADER) // Is dummy function in
- return; // SCUMM V3
+ if (_features & GF_SMALL_HEADER) { // Is WaitForSentence in SCUMM V3
+ if (_sentenceNum) {
+ if (_sentence[_sentenceNum - 1].unk && !isScriptInUse(_vars[VAR_SENTENCE_SCRIPT]))
+ return;
+ } else if (!isScriptInUse(_vars[VAR_SENTENCE_SCRIPT])) {
+ return;
+ }
+
+ _scriptPointer--;
+ o5_breakHere();
+ }
for (i = 0; i < 15; i++)
items[i] = 0;
More information about the Scummvm-git-logs
mailing list