[Scummvm-git-logs] scummvm branch-2-3 -> 17fe1125afc92b659eb1b95805548f378f513d1d

[mduggan]

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:
17fe1125af ULTIMA8: Allow turning while retreating in Crusader


Commit: 17fe1125afc92b659eb1b95805548f378f513d1d
    https://github.com/scummvm/scummvm/commit/17fe1125afc92b659eb1b95805548f378f513d1d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-11T22:17:04+09:00

Commit Message:
ULTIMA8: Allow turning while retreating in Crusader

The original game allows you to turn while retreating, but that was not
previously possible.

To make the turn always possible, step() now does not wait for the movement
animation.  This should work as AvatarMoverProcess::run terminates early if the
Avatar is busy.

Changed paths:
    engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp


diff --git a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
index 4359c9064f..2a3eec1905 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -67,7 +67,7 @@ void CruAvatarMoverProcess::run() {
 		if (_avatarAngle < 0) {
 			_avatarAngle = Direction_ToCentidegrees(avatar->getDir());
 		}
-		if (!hasMovementFlags(MOVE_FORWARD | MOVE_BACK | MOVE_JUMP | MOVE_STEP)) {
+		if (!hasMovementFlags(MOVE_FORWARD | MOVE_JUMP | MOVE_STEP)) {
 			// See comment on _avatarAngle in header about these constants
 			if (hasMovementFlags(MOVE_TURN_LEFT)) {
 				if (hasMovementFlags(MOVE_RUN))
@@ -509,7 +509,7 @@ void CruAvatarMoverProcess::step(Animation::Sequence action, Direction direction
 		return;
 
 	//debug(6, "Cru avatar step: picked action %d dir %d (test result %d)", action, direction, res);
-	waitFor(avatar->doAnim(action, direction));
+	avatar->doAnim(action, direction);
 }
 
 void CruAvatarMoverProcess::tryAttack() {