From 179ad3b845df131207c8ec7951d50df138a97c31 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 23 Feb 2004 09:21:22 +0000 Subject: the code was still wrong svn-id: r13005 --- scumm/script_v2.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scumm') 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() { -- cgit v1.2.3