diff options
| -rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/tsage/logo.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_journal.cpp | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index 2bb90f7af5..b3531e86bb 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -1229,6 +1229,8 @@ void ScalpelEngine::showScummVMSaveDialog() { saveGameState(slot, desc); } + + delete dialog; } void ScalpelEngine::showScummVMRestoreDialog() { @@ -1238,6 +1240,8 @@ void ScalpelEngine::showScummVMRestoreDialog() { if (slot >= 0) { loadGameState(slot); } + + delete dialog; } bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::Point &pos, bool halfSize) { diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp index 64539b941a..014470dcc8 100644 --- a/engines/sherlock/scalpel/tsage/logo.cpp +++ b/engines/sherlock/scalpel/tsage/logo.cpp @@ -423,6 +423,7 @@ Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb") { // Initialize counter _counter = 0; + _frameCounter = 0; // Initialize wait frame counters _waitFrames = 0; diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp index 57d3d242e8..b45d669c34 100644 --- a/engines/sherlock/tattoo/tattoo_journal.cpp +++ b/engines/sherlock/tattoo/tattoo_journal.cpp @@ -909,13 +909,13 @@ int TattooJournal::getFindName(bool printError) { if (events._released || events._rightReleased) { switch (_selector) { - case SB_CANCEL: + case (int)SB_CANCEL: done = -1; break; - case SB_BACKWARDS: + case (int)SB_BACKWARDS: done = 2; break; - case SB_FORWARDS: + case (int)SB_FORWARDS: done = 1; break; default: |