[Scummvm-cvs-logs] scummvm master -> 61bb7cc8ed55c506ac1b02cf6498bfca17ca4b60

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
61bb7cc8ed SHERLOCK: Fix Coverity warnings


Commit: 61bb7cc8ed55c506ac1b02cf6498bfca17ca4b60
    https://github.com/scummvm/scummvm/commit/61bb7cc8ed55c506ac1b02cf6498bfca17ca4b60
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-10T20:48:40-04:00

Commit Message:
SHERLOCK: Fix Coverity warnings

Changed paths:
    engines/sherlock/scalpel/scalpel.cpp
    engines/sherlock/scalpel/tsage/logo.cpp
    engines/sherlock/tattoo/tattoo_journal.cpp



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 2bb90f7..b3531e8 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 64539b9..014470d 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 57d3d24..b45d669 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: