[Scummvm-git-logs] scummvm master -> 3533979ea49d6f718ffa7f0d78950138888a940d

[alxpnv]

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:
3533979ea4 ASYLUM: fix setting cursor when hovering over the player


Commit: 3533979ea49d6f718ffa7f0d78950138888a940d
    https://github.com/scummvm/scummvm/commit/3533979ea49d6f718ffa7f0d78950138888a940d
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-01T12:51:44+03:00

Commit Message:
ASYLUM: fix setting cursor when hovering over the player

Regression from 5fe5a12

Changed paths:
    engines/asylum/views/scene.cpp


diff --git a/engines/asylum/views/scene.cpp b/engines/asylum/views/scene.cpp
index 3968cd9f69..24d9b3102c 100644
--- a/engines/asylum/views/scene.cpp
+++ b/engines/asylum/views/scene.cpp
@@ -800,8 +800,7 @@ void Scene::updateMouse() {
 		newDirection = kDirectionSE;
 	}
 
-	if (newDirection != kDirectionInvalid)
-		updateCursor(newDirection, actorRect);
+	updateCursor(newDirection, actorRect);
 
 	if (newDirection >= kDirectionN)
 		if (player->getStatus() == kActorStatusWalking || player->getStatus() == kActorStatusWalking2)
@@ -1150,10 +1149,12 @@ void Scene::updateCursor(ActorDirection direction, const Common::Rect &rect) {
 	if (getCursor()->getState() & kCursorStateRight) {
 		if (player->getStatus() == kActorStatusWalking || player->getStatus() == kActorStatusWalking2) {
 
-			ResourceId resourceId =_ws->cursorResources[direction];
+			if (direction >= kDirectionN) {
+				ResourceId resourceId =_ws->cursorResources[direction];
 
-			if (direction >= kDirectionN && getCursor()->getResourceId() != resourceId)
-				getCursor()->set(resourceId);
+				if (getCursor()->getResourceId() != resourceId)
+					getCursor()->set(resourceId);
+			}
 		}
 
 		return;