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

OMGPizzaGuy noreply at scummvm.org
Thu Oct 12 01:31:03 UTC 2023


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:
fb504e06ec ULTIMA8: Slow down to walk or step if animation ends off land.


Commit: fb504e06ec51cb767242b2bdb32690f583cc35a5
    https://github.com/scummvm/scummvm/commit/fb504e06ec51cb767242b2bdb32690f583cc35a5
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-10-11T20:30:44-05:00

Commit Message:
ULTIMA8: Slow down to walk or step if animation ends off land.
This fixes most cases of running down stairs causing a jump. The original game tries harder to not end off land, but controls worse due to that.

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


diff --git a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
index 535c3bf0d8b..5beb7e097e4 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
@@ -691,6 +691,13 @@ void U8AvatarMoverProcess::step(Animation::Sequence action, Direction direction,
 		action = Animation::stand;
 	}
 
+	if (action == Animation::walk && res == Animation::END_OFF_LAND) {
+		action = Animation::step;
+	}
+
+	if (action == Animation::run && res == Animation::END_OFF_LAND) {
+		action = Animation::walk;
+	}
 
 	bool moving = (action == Animation::run || action == Animation::walk);
 




More information about the Scummvm-git-logs mailing list