diff options
author | Tobias Gunkel | 2012-01-03 22:58:25 +0100 |
---|---|---|
committer | Tobias Gunkel | 2012-02-11 08:02:34 +0100 |
commit | a709a4231937fef823352cffb7146a94d9f8cccf (patch) | |
tree | cd464ca721c02c14987fe9210a8797e588b00b1b /engines/scumm/script_v2.cpp | |
parent | a79f224c23f1b0fa4d9850a032e0adc0d72619f7 (diff) | |
download | scummvm-rg350-a709a4231937fef823352cffb7146a94d9f8cccf.tar.gz scummvm-rg350-a709a4231937fef823352cffb7146a94d9f8cccf.tar.bz2 scummvm-rg350-a709a4231937fef823352cffb7146a94d9f8cccf.zip |
SCUMM: fix ScummEngine_v0::o_stopCurrentScript()
Diffstat (limited to 'engines/scumm/script_v2.cpp')
-rw-r--r-- | engines/scumm/script_v2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 76f6b02eb7..003bafa27e 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1190,11 +1190,7 @@ void ScummEngine_v2::o2_startScript() { runScript(script, 0, 0, 0); } -void ScummEngine_v2::o2_stopScript() { - int script; - - script = getVarOrDirectByte(PARAM_1); - +void ScummEngine_v2::stopScriptCommon(int script) { if (_game.id == GID_MANIAC && _roomResource == 26 && vm.slot[_currentScript].number == 10001) { // FIXME: Nasty hack for bug #915575 // Don't let the exit script for room 26 stop the script (116), when @@ -1215,6 +1211,10 @@ void ScummEngine_v2::o2_stopScript() { stopScript(script); } +void ScummEngine_v2::o2_stopScript() { + stopScriptCommon(getVarOrDirectByte(PARAM_1)); +} + void ScummEngine_v2::o2_panCameraTo() { panCameraTo(getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER, 0); } |