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

[OMGPizzaGuy]

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:
a9b68204f2 ULTIMA8: Reset to stand animation when actor enters fast area.


Commit: a9b68204f22cff1d71fc5d33cb948e8b056ed770
    https://github.com/scummvm/scummvm/commit/a9b68204f22cff1d71fc5d33cb948e8b056ed770
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-05-10T23:33:48-05:00

Commit Message:
ULTIMA8: Reset to stand animation when actor enters fast area.
This is similar to Crusader, but does not reset the actor activity. Fixes #14840

Changed paths:
    engines/ultima/ultima8/world/item.cpp


diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 035afed529e..b9ecec0598b 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1874,13 +1874,19 @@ uint32 Item::enterFastArea() {
 		if (actor && actor->isDead() && !call_even_if_dead) {
 			// dead actor, don't call the usecode
 		} else {
-			if (actor && _objId != 1 && GAME_IS_CRUSADER) {
-				uint16 lastactivity = actor->getLastActivityNo();
-				actor->clearLastActivityNo();
-				actor->clearInCombat();
-				actor->setToStartOfAnim(Animation::stand);
-				actor->clearActorFlag(Actor::ACT_WEAPONREADY);
-				actor->setActivity(lastactivity);
+			if (actor && _objId != 1) {
+				if (GAME_IS_CRUSADER) {
+					uint16 lastactivity = actor->getLastActivityNo();
+					actor->clearLastActivityNo();
+					actor->clearInCombat();
+					actor->setToStartOfAnim(Animation::stand);
+					actor->clearActorFlag(Actor::ACT_WEAPONREADY);
+					actor->setActivity(lastactivity);
+				} else {
+					actor->clearInCombat();
+					actor->setToStartOfAnim(Animation::stand);
+					actor->clearActorFlag(Actor::ACT_WEAPONREADY);
+				}
 			}
 
 			// TODO: For eggs, Crusader also resets the NPC info if a