aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-02-23 09:21:22 +0000
committerMax Horn2004-02-23 09:21:22 +0000
commit179ad3b845df131207c8ec7951d50df138a97c31 (patch)
tree752c9752942df598dd552e7ff3011a40e5ead5d3
parent1b82caa9126c2ce20bbb4f62af5d261ad12bab8a (diff)
downloadscummvm-rg350-179ad3b845df131207c8ec7951d50df138a97c31.tar.gz
scummvm-rg350-179ad3b845df131207c8ec7951d50df138a97c31.tar.bz2
scummvm-rg350-179ad3b845df131207c8ec7951d50df138a97c31.zip
the code was still wrong
svn-id: r13005
-rw-r--r--scumm/script_v2.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 01004a2ee7..26264e9d45 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -1122,12 +1122,10 @@ void ScummEngine_v2::o2_stopScript() {
if (script == 0)
script = vm.slot[_currentScript].number;
- if (_currentScript != 0) {
- if (vm.slot[_currentScript].number == script)
- stopObjectCode();
- } else {
+ if (_currentScript != 0 && vm.slot[_currentScript].number == script)
+ stopObjectCode();
+ else
stopScript(script);
- }
}
void ScummEngine_v2::o2_panCameraTo() {