diff options
| author | Christopher Page | 2008-08-09 19:03:29 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-09 19:03:29 +0000 |
| commit | ce3d1e1a7d9ec9860d3fc42d8127a1634051d950 (patch) | |
| tree | fbf6c9a71e7e4bdb90d502755d282c183562e93b /engines/agos/script.cpp | |
| parent | f41471d34bb6afb1dc0b6604b1952d10ef583765 (diff) | |
| parent | 71f4a15e4efebf4de7a25d2b09817cf3a5aa51b5 (diff) | |
| download | scummvm-rg350-ce3d1e1a7d9ec9860d3fc42d8127a1634051d950.tar.gz scummvm-rg350-ce3d1e1a7d9ec9860d3fc42d8127a1634051d950.tar.bz2 scummvm-rg350-ce3d1e1a7d9ec9860d3fc42d8127a1634051d950.zip | |
Merged revisions 33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33720
Diffstat (limited to 'engines/agos/script.cpp')
| -rw-r--r-- | engines/agos/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index a0151d7713..2a2ddeeb86 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -1012,7 +1012,7 @@ int AGOSEngine::runScript() { executeOpcode(_opcode); } while (getScriptCondition() != flag && !getScriptReturn() && !quit()); - return getScriptReturn(); + return (_quit) ? 1 : getScriptReturn(); } Child *nextSub(Child *sub, int16 key) { |