diff options
| author | Eugene Sandulenko | 2016-07-11 00:53:34 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
| commit | 5e99a9858ba10e29e9b3b735ea9f40b19a559561 (patch) | |
| tree | 0c8848263e3c499123f2f16f6750b3251a5fcfdf /engines/director/lingo/lingo-funcs.cpp | |
| parent | 4d2e4a8c7345ae996b9ed6c8c3fbc3bc5f063ac8 (diff) | |
| download | scummvm-rg350-5e99a9858ba10e29e9b3b735ea9f40b19a559561.tar.gz scummvm-rg350-5e99a9858ba10e29e9b3b735ea9f40b19a559561.tar.bz2 scummvm-rg350-5e99a9858ba10e29e9b3b735ea9f40b19a559561.zip | |
DIRECTOR: Lingo: Gracefully return when movie does not exits
Diffstat (limited to 'engines/director/lingo/lingo-funcs.cpp')
| -rw-r--r-- | engines/director/lingo/lingo-funcs.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp index 50120cf036..08b3d455ca 100644 --- a/engines/director/lingo/lingo-funcs.cpp +++ b/engines/director/lingo/lingo-funcs.cpp @@ -190,8 +190,10 @@ void Lingo::func_mciwait(Common::String &s) { } void Lingo::func_goto(Common::String &frame, Common::String &movie) { - if (!_vm->_movies || !_vm->_movies->contains(movie)) - error("Movie %s does not exist", movie.c_str()); + if (!_vm->_movies || !_vm->_movies->contains(movie)) { + warning("Movie %s does not exist", movie.c_str()); + return; + } _vm->_currentScore = _vm->_movies->getVal(movie); _vm->_currentScore->loadArchive(); |