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

[Strangerke]

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:
de883e6198 HOPKINS: Fix some warnings reported by CppCheck


Commit: de883e6198eb651d31b001f72d32c9e07b1527c0
    https://github.com/scummvm/scummvm/commit/de883e6198eb651d31b001f72d32c9e07b1527c0
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-18T00:19:33-07:00

Commit Message:
HOPKINS: Fix some warnings reported by CppCheck

Changed paths:
    engines/hopkins/anim.cpp
    engines/hopkins/lines.cpp
    engines/hopkins/menu.h
    engines/hopkins/saveload.h



diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index ac15139..f712b11 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -702,8 +702,8 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
 		}
 	}
 	_vm->_eventsManager._rateCounter = 0;
-	int soundNumber = 0;
 	if (!skipFl) {
+		int soundNumber = 0;
 		for (;;) {
 			++soundNumber;
 			_vm->_soundManager.playAnimSound(soundNumber);
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 42de5b7..c6238c5 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2014,9 +2014,7 @@ RouteItem *LinesManager::cityMapCarRoute(int x1, int y1, int x2, int y2) {
 			break;
 		arrDataIdx[DIR_UP] = 0;
 		arrLineIdx[DIR_UP] = -1;
-		if (arrDelta[DIR_UP] <= delta && arrLineIdx[DIR_UP] != -1)
-			break;
-		if (arrDelta[DIR_DOWN] <= delta && arrLineIdx[DIR_DOWN] != -1)
+		if ((arrDelta[DIR_UP] <= delta && arrLineIdx[DIR_UP] != -1) || (arrDelta[DIR_DOWN] <= delta && arrLineIdx[DIR_DOWN] != -1))
 			break;
 	}
 	arrDelta[DIR_UP] = delta;
diff --git a/engines/hopkins/menu.h b/engines/hopkins/menu.h
index aeb3aa1..542b773 100644
--- a/engines/hopkins/menu.h
+++ b/engines/hopkins/menu.h
@@ -36,6 +36,7 @@ private:
 	HopkinsEngine *_vm;
 
 public:
+	MenuManager() {}
 	void setParent(HopkinsEngine *vm);
 
 	int menu();
diff --git a/engines/hopkins/saveload.h b/engines/hopkins/saveload.h
index 2a7806e..8076519 100644
--- a/engines/hopkins/saveload.h
+++ b/engines/hopkins/saveload.h
@@ -54,6 +54,7 @@ private:
 	void syncSavegameData(Common::Serializer &s, int version);
 	void syncCharacterLocation(Common::Serializer &s, CharacterLocation &item);
 public:
+	SaveLoadManager() {}
 	void setParent(HopkinsEngine *vm);
 
 	void initSaves();