Fix direction bug in internalMoveCreature

marksamman · marksamman · commit c4a707201c7c · 2015-05-14T22:04:05.000+02:00
diff --git a/src/game.cpp b/src/game.cpp
@@ -867,7 +867,10 @@ ReturnValue Game::internalMoveCreature(Creature& creature, Tile& toTile, uint32_
 		const Position& fromPosition = fromCylinder->getPosition();
 		const Position& toPosition = toCylinder->getPosition();
 		if (fromPosition.z != toPosition.z && (fromPosition.x != toPosition.x || fromPosition.y != toPosition.y)) {
-			internalCreatureTurn(&creature, getDirectionTo(fromPosition, toPosition));
+			Direction dir = getDirectionTo(fromPosition, toPosition);
+			if ((dir & DIRECTION_DIAGONAL_MASK) == 0) {
+				internalCreatureTurn(&creature, dir);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -867,7 +867,10 @@ ReturnValue Game::internalMoveCreature(Creature& creature, Tile& toTile, uint32_`
`867`	`867`	`const Position& fromPosition = fromCylinder->getPosition();`
`868`	`868`	`const Position& toPosition = toCylinder->getPosition();`
`869`	`869`	`if (fromPosition.z != toPosition.z && (fromPosition.x != toPosition.x \|\| fromPosition.y != toPosition.y)) {`
`870`		`- internalCreatureTurn(&creature, getDirectionTo(fromPosition, toPosition));`
	`870`	`+ Direction dir = getDirectionTo(fromPosition, toPosition);`
	`871`	`+ if ((dir & DIRECTION_DIAGONAL_MASK) == 0) {`
	`872`	`+ internalCreatureTurn(&creature, dir);`
	`873`	`+ }`
`871`	`874`	`}`
`872`	`875`	`}`
`873`	`876`