diff options
| author | Eugene Sandulenko | 2020-01-10 16:58:34 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2020-01-10 16:58:34 +0100 |
| commit | 26812078b5bd3d1ef272f4f830990e3ddefa77de (patch) | |
| tree | 80f2d809c15270c1c0a7880b75125532b7b37434 | |
| parent | be69970112a045da9eefa035e2d3f38b6996685c (diff) | |
| download | scummvm-rg350-26812078b5bd3d1ef272f4f830990e3ddefa77de.tar.gz scummvm-rg350-26812078b5bd3d1ef272f4f830990e3ddefa77de.tar.bz2 scummvm-rg350-26812078b5bd3d1ef272f4f830990e3ddefa77de.zip | |
DIRECTOR: Properly iterate over all movies when test-all is requested
| -rw-r--r-- | engines/director/director.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp index 13b86adb25..cc48b0492f 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -191,7 +191,8 @@ Common::Error DirectorEngine::run() { while (loop) { loop = false; - _currentScore->loadArchive(); + if (_currentScore) + _currentScore->loadArchive(); // If we came in a loop, then skip as requested if (!_nextMovie.frameS.empty()) { @@ -232,6 +233,11 @@ Common::Error DirectorEngine::run() { if (!mov) { warning("nextMovie: No score is loaded"); + if (getGameID() == GID_TESTALL) { + loop = true; + continue; + } + return Common::kNoError; } |