[Scummvm-cvs-logs] scummvm master -> e4b4fd049364c839f0987cc982a01c57f70366bf

[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:
e4b4fd0493 SHERLOCK: RT: Fix Coverity problems


Commit: e4b4fd049364c839f0987cc982a01c57f70366bf
    https://github.com/scummvm/scummvm/commit/e4b4fd049364c839f0987cc982a01c57f70366bf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-29T19:43:44-04:00

Commit Message:
SHERLOCK: RT: Fix Coverity problems

Changed paths:
    engines/sherlock/image_file.cpp
    engines/sherlock/inventory.cpp
    engines/sherlock/journal.cpp
    engines/sherlock/music.cpp
    engines/sherlock/scalpel/scalpel_inventory.cpp
    engines/sherlock/tattoo/widget_verbs.cpp



diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index 4d713b1..7e14ebe 100644
--- a/engines/sherlock/image_file.cpp
+++ b/engines/sherlock/image_file.cpp
@@ -1016,6 +1016,7 @@ StreamingImageFile::StreamingImageFile() {
 	_flags = 0;
 	_scaleVal = 0;
 	_zPlacement = 0;
+	_compressed = false;
 }
 
 StreamingImageFile::~StreamingImageFile() {
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index c74034f..01d515c 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -30,13 +30,13 @@ namespace Sherlock {
 
 InventoryItem::InventoryItem(int requiredFlag, const Common::String &name,
 		const Common::String &description, const Common::String &examine) :
-		_requiredFlag(requiredFlag), _name(name), _description(description),
+		_requiredFlag(requiredFlag), _requiredFlag1(0), _name(name), _description(description),
 		_examine(examine), _lookFlag(0) {
 }
 
 InventoryItem::InventoryItem(int requiredFlag, const Common::String &name,
 		const Common::String &description, const Common::String &examine, const Common::String &verbName) :
-		_requiredFlag(requiredFlag), _name(name), _description(description),
+		_requiredFlag(requiredFlag), _requiredFlag1(0), _name(name), _description(description),
 		_examine(examine), _lookFlag(0) {
 	_verb._verb = verbName;
 }
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index a0c9108..bcac69f 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -37,6 +37,11 @@ Journal *Journal::init(SherlockEngine *vm) {
 }
 
 Journal::Journal(SherlockEngine *vm) : _vm(vm) {
+	_up = _down = false;
+	_index = 0;
+	_page = 0;
+	_maxPage = 0;
+	_sub = 0;
 }
 
 bool Journal::drawJournal(int direction, int howFar) {
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index c6e542d..1f211f4 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -450,12 +450,6 @@ bool Music::playMusic(const Common::String &name) {
 				return false;
 			}
 		} else {
-			if (dataSize < 4) {
-				warning("Music: expected music header not found in music file");
-				delete[] midiMusicData;
-				return false;
-			}
-
 			if (memcmp("FORM", dataPos, 4)) {
 				warning("Music: expected header not found in music file");
 				delete[] midiMusicData;
diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp
index 11f2b33..e19a432 100644
--- a/engines/sherlock/scalpel/scalpel_inventory.cpp
+++ b/engines/sherlock/scalpel/scalpel_inventory.cpp
@@ -85,7 +85,7 @@ void ScalpelInventory::drawInventory(InvNewMode mode) {
 
 	if (tempMode == INVENTORY_DONT_DISPLAY)
 		mode = LOOK_INVENTORY_MODE;
-	_invMode = (InvMode)mode;
+	_invMode = (InvMode)((int)mode);
 
 	if (mode != PLAIN_INVENTORY) {
 		ui._oldKey = INVENTORY_COMMANDS[(int)mode];
diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp
index 2eaa70b..8da60bc 100644
--- a/engines/sherlock/tattoo/widget_verbs.cpp
+++ b/engines/sherlock/tattoo/widget_verbs.cpp
@@ -173,7 +173,7 @@ void WidgetVerbs::handleEvents() {
 		_outsideMenu = true;
 
 	// See if they released the mouse button
-	if (events._released || events._released) {
+	if (events._released || events._rightReleased) {
 		// See if they want to close the menu (they clicked outside of the menu)
 		if (!_bounds.contains(mousePos)) {
 			if (_outsideMenu) {