[Scummvm-cvs-logs] scummvm master -> 0132689c99ac324c1f07ea7d4f2933c7a8da2b04

Strangerke Strangerke at scummvm.org
Mon May 30 07:28:28 CEST 2016


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:
0132689c99 GNAP: Remove duplicate code


Commit: 0132689c99ac324c1f07ea7d4f2933c7a8da2b04
    https://github.com/scummvm/scummvm/commit/0132689c99ac324c1f07ea7d4f2933c7a8da2b04
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-30T07:19:21+02:00

Commit Message:
GNAP: Remove duplicate code

Changed paths:
    engines/gnap/character.cpp



diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index 36d849a..56e5200 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -402,22 +402,12 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) {
 
 	case kGSMoan1:
 		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;






More information about the Scummvm-git-logs mailing list