[Scummvm-git-logs] scummvm master -> 32daf91abe3b4128cce90213e893a7cb7e1b87e7

[athrxx]

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:
32daf91abe SCUMM: (v7/8) - improve fix for bug no. 14616


Commit: 32daf91abe3b4128cce90213e893a7cb7e1b87e7
    https://github.com/scummvm/scummvm/commit/32daf91abe3b4128cce90213e893a7cb7e1b87e7
Author: athrxx (athrxx at scummvm.org)
Date: 2023-10-05T18:00:41+02:00

Commit Message:
SCUMM: (v7/8) - improve fix for bug no. 14616

(make it more consistent with original code behavior)

Changed paths:
    engines/scumm/actor.cpp
    engines/scumm/akos.h


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 1f7b398793d..52513636e91 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1515,12 +1515,13 @@ void Actor::setDirection(int direction) {
 	int i;
 	uint16 vald;
 
+	direction = (direction + 360) % 360;
+
 	// Do nothing if actor is already facing in the given direction
-	if (_facing == (direction + 360) % 360)
+	if (_facing == direction)
 		return;
 
-	// Normalize the angle
-	_facing = normalizeAngle(_vm->_costumeLoader->hasManyDirections(_costume), direction);
+	_facing = direction;
 
 	// If there is no costume set for this actor, we are finished
 	if (_costume == 0)
diff --git a/engines/scumm/akos.h b/engines/scumm/akos.h
index a7e3d50fdff..e17d922791c 100644
--- a/engines/scumm/akos.h
+++ b/engines/scumm/akos.h
@@ -48,9 +48,6 @@ public:
 
 	//void animateLimb(int limb, int f);
 	bool hasManyDirections(int id) override {
-		if (id == 0)
-			return false;
-
 		loadCostume(id);
 		return hasManyDirections();
 	}