aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorRalph Brorsen2002-08-25 11:35:13 +0000
committerRalph Brorsen2002-08-25 11:35:13 +0000
commitd473d295c4513db29ddefeed321d5c4ee48b6195 (patch)
treebe551c6bba565a8036f9a94c40390d6deab7983b /scumm/script_v2.cpp
parentfe53d3ecc2226082561eadbe288d2c8dcdd98e65 (diff)
downloadscummvm-rg350-d473d295c4513db29ddefeed321d5c4ee48b6195.tar.gz
scummvm-rg350-d473d295c4513db29ddefeed321d5c4ee48b6195.tar.bz2
scummvm-rg350-d473d295c4513db29ddefeed321d5c4ee48b6195.zip
Fix for #556564
svn-id: r4846
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 5487e9dc1e..cde491405d 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -286,7 +286,7 @@ void Scumm::setupOpcodes2()
/* C8 */
&Scumm::o6_kernelFunction,
&Scumm::o6_miscOps,
- &Scumm::o6_breakMaybe,
+ &Scumm::o6_delayFrames,
&Scumm::o6_pickOneOf,
/* CC */
&Scumm::o6_pickOneOfDefault,
@@ -2984,15 +2984,15 @@ void Scumm::o6_kernelFunction()
}
}
-void Scumm::o6_breakMaybe()
+void Scumm::o6_delayFrames()
{
ScriptSlot *ss = &vm.slot[_currentScript];
- if (ss->newfield == 0) {
- ss->newfield = pop();
+ if (ss->delayFrameCount== 0) {
+ ss->delayFrameCount = pop();
} else {
- ss->newfield--;
+ ss->delayFrameCount--;
}
- if (ss->newfield) {
+ if (ss->delayFrameCount) {
_scriptPointer--;
o6_breakHere();
}