thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33720
This commit is contained in:
Christopher Page 2008-08-09 19:03:29 +00:00
commit ce3d1e1a7d
51 changed files with 550 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/agos/script.cpp
View file

@ -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) {