[Scummvm-git-logs] scummvm master -> 560f10c346d618caa6bdcc42647f691d6ab26fd0

[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:
560f10c346 XEEN: Fix Coverity warnings


Commit: 560f10c346d618caa6bdcc42647f691d6ab26fd0
    https://github.com/scummvm/scummvm/commit/560f10c346d618caa6bdcc42647f691d6ab26fd0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-07-26T18:54:17-07:00

Commit Message:
XEEN: Fix Coverity warnings

Changed paths:
    engines/xeen/combat.cpp
    engines/xeen/detection.cpp
    engines/xeen/files.cpp
    engines/xeen/files.h
    engines/xeen/interface.cpp
    engines/xeen/item.cpp
    engines/xeen/worldofxeen/clouds_cutscenes.h
    engines/xeen/worldofxeen/darkside_cutscenes.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 4dd2ac6..f6d16ae 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1612,10 +1612,6 @@ bool Combat::hitMonster(Character &c, RangeType rangeType) {
 	int divisor = 0;
 
 	switch (c._class) {
-	case CLASS_KNIGHT:
-	case CLASS_BARBARIAN:
-		divisor = 1;
-		break;
 	case CLASS_PALADIN :
 	case CLASS_ARCHER:
 	case CLASS_ROBBER:
@@ -1630,7 +1626,10 @@ bool Combat::hitMonster(Character &c, RangeType rangeType) {
 	case CLASS_SORCERER:
 		divisor = 4;
 		break;
+	case CLASS_KNIGHT:
+	case CLASS_BARBARIAN:
 	default:
+		divisor = 1;
 		break;
 	}
 
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index 8a5e096..d304d95 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -164,7 +164,7 @@ bool XeenMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 		error("Invalid game");
 	}
 
-	return gd != 0;
+	return true;
 }
 
 SaveStateList XeenMetaEngine::listSaves(const char *target) const {
diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp
index d18b5c4..ecac2c5 100644
--- a/engines/xeen/files.cpp
+++ b/engines/xeen/files.cpp
@@ -444,8 +444,7 @@ void StringArray::load(const Common::String &name, int ccMode) {
 
 /*------------------------------------------------------------------------*/
 
-SaveArchive::SaveArchive(Party *party) : BaseCCArchive(), _party(party) {
-	_data = nullptr;
+SaveArchive::SaveArchive(Party *party) : BaseCCArchive(), _party(party), _data(nullptr), _dataSize(0) {
 }
 
 SaveArchive::~SaveArchive() {
diff --git a/engines/xeen/files.h b/engines/xeen/files.h
index 0d42154..6289cc2 100644
--- a/engines/xeen/files.h
+++ b/engines/xeen/files.h
@@ -212,7 +212,6 @@ class SubWriteStream : virtual public Common::WriteStream {
 protected:
 	Common::WriteStream *_parentStream;
 	uint32 _begin;
-	DisposeAfterUse::Flag _disposeAfterUse;
 public:
 	SubWriteStream(Common::WriteStream *parentStream) :
 		_parentStream(parentStream),  _begin(parentStream->pos()) {
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 63c0483..5b5b497 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -162,6 +162,7 @@ Interface::Interface(XeenEngine *vm) : ButtonContainer(vm), InterfaceScene(vm),
 	_face1State = _face2State = 0;
 	_upDoorText = false;
 	_tillMove = 0;
+	_iconsMode = ICONS_STANDARD;
 	Common::fill(&_charFX[0], &_charFX[MAX_ACTIVE_PARTY], 0);
 	setWaitBounds();
 }
diff --git a/engines/xeen/item.cpp b/engines/xeen/item.cpp
index a364dad..5c0a55a 100644
--- a/engines/xeen/item.cpp
+++ b/engines/xeen/item.cpp
@@ -113,7 +113,7 @@ const char *XeenItem::getItemName(ItemCategory category, uint id) {
 		case CATEGORY_ACCESSORY:
 			return questItems[id - QUEST_OFFSET + 35 + 14];
 		default:
-			assert(g_vm->getGameID() != GType_Swords);
+			assert(g_vm->getGameID() != GType_Swords && (id - QUEST_OFFSET + 35 + 14 + 11) < 85);
 			return questItems[id - QUEST_OFFSET + 35 + 14 + 11];
 		}
 	}
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h
index 39fded6..821ded4 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.h
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.h
@@ -81,7 +81,7 @@ private:
 	 */
 	bool showCloudsEnding5();
 public:
-	CloudsCutscenes(XeenEngine *vm) : Cutscenes(vm) {}
+	CloudsCutscenes(XeenEngine *vm) : Cutscenes(vm), _mergeX(0) {}
 
 	/**
 	 * Shows the Clouds of Xeen intro sequence
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index c0ef2e9..3e21d21 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -627,11 +627,6 @@ bool DarkSideCutscenes::showDarkSideIntro2() {
 			wizard.draw(0, 0, Common::Point(9, 57));
 		fizzle.draw(0, idx, Common::Point(9, 57));
 
-		if (!sound.isSoundPlaying() && !vocIndex) {
-			sound.playVoice("pharoh7t.voc");
-			vocIndex = 1;
-		}
-
 		_subtitles.show();
 		WAIT(3);
 	}