[Scummvm-git-logs] scummvm master -> 45c79ea4c7bb880635d575863d7d60fe6d403ec4

[mduggan]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5cd9e68778 ULTIMA8: Only allow Crusader run on NPCs that can do it
45c79ea4c7 ULTIMA8: Add more debug output to ActorAnim watch.


Commit: 5cd9e68778c5077378037ca946dc95f5e53ade92
    https://github.com/scummvm/scummvm/commit/5cd9e68778c5077378037ca946dc95f5e53ade92
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-05-02T22:42:26+09:00

Commit Message:
ULTIMA8: Only allow Crusader run on NPCs that can do it

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 70919b4fc5..58d6563810 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -135,7 +135,7 @@ void CruAvatarMoverProcess::handleCombatMode() {
 		if (hasMovementFlags(MOVE_STEP)) {
 			nextanim = avatar->isKneeling() ?
 							Animation::kneelingAdvance : Animation::advance;
-		} else if (hasMovementFlags(MOVE_RUN)) {
+		} else if (hasMovementFlags(MOVE_RUN) && avatar->hasAnim(Animation::combatRunSmallWeapon)) {
 			// Take a step before running
 			if (lastanim == Animation::walk || _isAnimRunningJumping(lastanim) || _isAnimStartRunning(lastanim))
 				nextanim = Animation::combatRunSmallWeapon;


Commit: 45c79ea4c7bb880635d575863d7d60fe6d403ec4
    https://github.com/scummvm/scummvm/commit/45c79ea4c7bb880635d575863d7d60fe6d403ec4
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-05-02T22:43:32+09:00

Commit Message:
ULTIMA8: Add more debug output to ActorAnim watch.

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


diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index 4d582ce2a6..7af2516360 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -67,6 +67,13 @@ ActorAnimProcess::ActorAnimProcess(Actor *actor, Animation::Sequence action,
 	_itemNum = actor->getObjId();
 
 	_type = ACTOR_ANIM_PROC_TYPE;
+#ifdef WATCHACTOR
+	if (_itemNum == watchactor)
+		pout << "Animation [" << Kernel::get_instance()->getFrameNum()
+			 << "] ActorAnimProcess created (" << _itemNum << ","
+			 << _action << "," << _dir << ") steps " << _steps
+			 << Std::endl;
+#endif
 }
 
 bool ActorAnimProcess::init() {
@@ -117,7 +124,7 @@ bool ActorAnimProcess::init() {
 #ifdef WATCHACTOR
 	if (_itemNum == watchactor)
 		pout << "Animation [" << Kernel::get_instance()->getFrameNum()
-		     << "] ActorAnimProcess " << getPid() << " created ("
+		     << "] ActorAnimProcess " << getPid() << " initalized ("
 			 << _itemNum << "," << _action << "," << _dir << ") steps "
 			 << _steps << Std::endl;
 #endif
@@ -327,7 +334,9 @@ void ActorAnimProcess::run() {
 		     << "] showing frame (" << x << "," << y << "," << z << ")"
 		     << " shape (" << a->getShape() << "," << _tracker->getFrame()
 		     << ") sfx " << _tracker->getAnimFrame()->_sfx
-		     << " rep " << _repeatCounter << " ";
+		     << " rep " << _repeatCounter << ConsoleStream::hex
+			 << " flags " << _tracker->getAnimFrame()->_flags << " "
+			 << ConsoleStream::dec;
 
 		if (_tracker->isDone()) pout << "D";
 		if (_tracker->isBlocked()) pout << "B";