TITANIC: Fix Coverity warnings

scummvm · Aug 2, 2016 · 3325d42 · 3325d42
1 parent 903dc7d
commit 3325d42
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
@@ -250,7 +250,7 @@ bool CViewItem::MouseMoveMsg(CMouseMoveMsg *msg) {
 
 bool CViewItem::handleMouseMsg(CMouseMsg *msg, bool flag) {
 	CMouseButtonUpMsg *upMsg = dynamic_cast<CMouseButtonUpMsg *>(msg);
-	if (msg->isButtonUpMsg()) {
+	if (upMsg) {
 		handleButtonUpMsg(upMsg);
 		return true;
 	}

diff --git a/engines/titanic/pet_control/pet_inventory.cpp b/engines/titanic/pet_control/pet_inventory.cpp
@@ -202,16 +202,15 @@ int CPetInventory::getItemIndex(CGameObject *item) const {
 
 CGameObject *CPetInventory::getImage(int index) {
 	if (index >= 0 && index < 46) {
-		int offset = index - 20;
 		int bits = 0;
-		switch (offset) {
-		case 0:
+		switch (index) {
+		case 20:
 			bits = 4;
 			break;
-		case 1:
+		case 21:
 			bits = 8;
 			break;
-		case 2:
+		case 22:
 			bits = 1;
 			break;
 		case 23:

diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
@@ -258,7 +258,7 @@ void AVISurface::setupDecompressor() {
 			g_system->getScreenFormat());
 
 		// TODO: See whether this simplified form of original works
-		if (idx == 2)
+		if (idx == 1)
 			_videoSurface->_transBlitFlag = true;
 	}
 }

diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
@@ -260,12 +260,14 @@ void STFont::checkLineWrap(Point &textSize, int maxWidth, const char *&str) cons
 		if (*srcPtr == ' ' && flag)
 			break;
 
-		if (*srcPtr == TEXTCMD_NPC)
+		if (*srcPtr == TEXTCMD_NPC) {
 			srcPtr += 3;
-		else if (*srcPtr == TEXTCMD_SET_COLOR)
+		} else if (*srcPtr == TEXTCMD_SET_COLOR) {
 			srcPtr += 4;
-		else
+		} else {
 			totalWidth += _chars[(byte)*srcPtr]._width;
+			flag = true;
+		}
 	}
 
 	if ((textSize.x + totalWidth) >= maxWidth && totalWidth < maxWidth) {

diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
@@ -69,7 +69,6 @@ int DeskbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 	bool flag20 = getValue(20) != 0;
 	CTrueTalkManager::setFlags(20, 0);
 	checkItems(nullptr, nullptr);
-	getState();
 
 	if (preprocess(roomScript, sentence) != 1)
 		return 1;