[Scummvm-git-logs] scummvm master -> af711862843b83b85537dfb198d0b089ca1ed9d0

mduggan noreply at scummvm.org
Sat Jun 4 10:53:05 UTC 2022


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:
af71186284 ULTIMA8: Allow key-tap turns running in combat in Crusader


Commit: af711862843b83b85537dfb198d0b089ca1ed9d0
    https://github.com/scummvm/scummvm/commit/af711862843b83b85537dfb198d0b089ca1ed9d0
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2022-06-04T19:52:14+09:00

Commit Message:
ULTIMA8: Allow key-tap turns running in combat in Crusader

Key tap should turn whether in combat or not.

This fixes #13383.

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 660ddccd749..d48093511da 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -61,8 +61,9 @@ void CruAvatarMoverProcess::run() {
 	if (!avatar)
 		return;
 
-	// When not in combat the angle is kept as -1
-	if (avatar->isInCombat()) {
+	// When in combat and not running, update the angle.
+	// Otherwise, angle is kept as -1 and direction is just actor dir.
+	if (avatar->isInCombat() && (avatar->getLastAnim() != Animation::run)) {
 		if (_avatarAngle < 0) {
 			_avatarAngle = Direction_ToCentidegrees(avatar->getDir());
 		}




More information about the Scummvm-git-logs mailing list