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

[Strangerke]

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

Summary:
93e0f8f03b AGOS: Fix uninitialized variables
b91d12557f GNAP: Remove duplicate code in character


Commit: 93e0f8f03bc88420bc9f0862a92c72fede0664ab
    https://github.com/scummvm/scummvm/commit/93e0f8f03bc88420bc9f0862a92c72fede0664ab
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-24T19:49:38+02:00

Commit Message:
AGOS: Fix uninitialized variables

Changed paths:
    engines/agos/animation.cpp
    engines/agos/feeble.cpp



diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index 83682d5..123e580 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -57,6 +57,7 @@ MoviePlayer::MoviePlayer(AGOSEngine_Feeble *vm)
 	memset(baseName, 0, sizeof(baseName));
 
 	_ticks = 0;
+	_bgSoundStream = nullptr;
 }
 
 MoviePlayer::~MoviePlayer() {
diff --git a/engines/agos/feeble.cpp b/engines/agos/feeble.cpp
index bfd11fa..9177262 100644
--- a/engines/agos/feeble.cpp
+++ b/engines/agos/feeble.cpp
@@ -39,6 +39,7 @@ AGOSEngine_Feeble::AGOSEngine_Feeble(OSystem *system, const AGOSGameDescription
 	_moviePlayer = 0;
 	_vgaCurSpritePriority = 0;
 	_mouseToggle = false;
+	_opcodesFeeble = nullptr;
 }
 
 AGOSEngine_Feeble::~AGOSEngine_Feeble() {


Commit: b91d12557f0b458b62d6a971de8be4de114673ac
    https://github.com/scummvm/scummvm/commit/b91d12557f0b458b62d6a971de8be4de114673ac
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-24T21:41:02+02:00

Commit Message:
GNAP: Remove duplicate code in character

Changed paths:
    engines/gnap/character.cpp



diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index 76e30d9..407ecb1 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -430,22 +430,12 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) {
 
 	case kGSMoan2:
 		if (gridPos.x > 0 && gridPos.y > 0) {
-			if (_pos.y > gridPos.y) {
-				if (_pos.x > gridPos.x) {
-					sequenceId = 0x832;
-					_idleFacing = kDirBottomLeft;
-				} else {
-					sequenceId = 0x7AA;
-					_idleFacing = kDirBottomRight;
-				}
+			if (_pos.x > gridPos.x) {
+				sequenceId = 0x832;
+				_idleFacing = kDirBottomLeft;
 			} else {
-				if (_pos.x > gridPos.x) {
-					sequenceId = 0x832;
-					_idleFacing = kDirBottomLeft;
-				} else {
-					sequenceId = 0x7AA;
-					_idleFacing = kDirBottomRight;
-				}
+				sequenceId = 0x7AA;
+				_idleFacing = kDirBottomRight;
 			}
 		} else if (_idleFacing != kDirBottomRight && _idleFacing != kDirUpRight) {
 			sequenceId = 0x832;
@@ -861,17 +851,10 @@ int PlayerGnap::getShowSequenceId(int index, int gridX, int gridY) {
 	Facing facing = _idleFacing;
 
 	if (gridY > 0 && gridX > 0) {
-		if (_pos.y > gridY) {
-			if (_pos.x > gridX)
-				_idleFacing = kDirUpLeft;
-			else
-				_idleFacing = kDirUpRight;
-		} else {
-			if (_pos.x > gridX)
-				_idleFacing = kDirUpLeft;
-			else
-				_idleFacing = kDirUpRight;
-		}
+		if (_pos.x > gridX)
+			_idleFacing = kDirUpLeft;
+		else
+			_idleFacing = kDirUpRight;
 	} else if (_idleFacing != kDirBottomRight && _idleFacing != kDirUpRight) {
 		_idleFacing = kDirUpLeft;
 	} else {