diff options
| author | Strangerke | 2015-06-13 07:52:42 +0200 |
|---|---|---|
| committer | Strangerke | 2015-06-13 07:52:42 +0200 |
| commit | b87b081cfca659e02717b1055d746884aea5fa4a (patch) | |
| tree | 08fff278f913a1c715bf64765bac5458121e2f9b | |
| parent | 803c06beb919b35d29bb65ec2e7e48caca69c730 (diff) | |
| download | scummvm-rg350-b87b081cfca659e02717b1055d746884aea5fa4a.tar.gz scummvm-rg350-b87b081cfca659e02717b1055d746884aea5fa4a.tar.bz2 scummvm-rg350-b87b081cfca659e02717b1055d746884aea5fa4a.zip | |
SHERLOCK: Fix 3 CppCheck warnings
| -rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index 33f8c6b7a2..cfe9b82d4e 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -250,7 +250,7 @@ void ScalpelEngine::showOpening() { if (finished) finished = showStreetCutscene3DO(); if (finished) - finished = showOfficeCutscene3DO(); + showOfficeCutscene3DO(); _events->clearEvents(); _music->stopMusic(); @@ -264,7 +264,7 @@ void ScalpelEngine::showOpening() { if (finished) finished = showStreetCutscene(); if (finished) - finished = showOfficeCutscene(); + showOfficeCutscene(); _events->clearEvents(); _music->stopMusic(); @@ -736,9 +736,7 @@ bool ScalpelEngine::showStreetCutscene3DO() { } bool ScalpelEngine::showOfficeCutscene3DO() { - bool finished = true; - - finished = _music->waitUntilMSec(151000, 0, 0, 1000); + bool finished = _music->waitUntilMSec(151000, 0, 0, 1000); if (finished) _animation->play3DO("COFF1", true, 1, false, 3); |