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

[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:
f64f6154a8 ULTIMA8: Reset movement flags on pause and remove left-click jump on keybind movement


Commit: f64f6154a80e6bd2c81866afdacbb6737a5713a4
    https://github.com/scummvm/scummvm/commit/f64f6154a80e6bd2c81866afdacbb6737a5713a4
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-01-11T21:04:24-06:00

Commit Message:
ULTIMA8: Reset movement flags on pause and remove left-click jump on keybind movement
Fixes #14852

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


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 7c66d48ff9d..c88c542d3f4 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -199,6 +199,8 @@ void Ultima8Engine::pauseEngineIntern(bool pause) {
 		if (midiPlayer)
 			midiPlayer->pause(pause);
 	}
+
+	_avatarMoverProcess->resetMovementFlags();
 }
 
 bool Ultima8Engine::hasFeature(EngineFeature f) const {
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 5beb7e097e4..23a64f6354d 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
@@ -434,7 +434,7 @@ void U8AvatarMoverProcess::handleNormalMode() {
 		}
 	}
 
-	if ((!_mouseButton[0].isState(MBS_HANDLED) || m0unhandled) && hasMovementFlags(MOVE_ANY_DIRECTION | MOVE_STEP)) {
+	if ((!_mouseButton[0].isState(MBS_HANDLED) || m0unhandled) && hasMovementFlags(MOVE_MOUSE_DIRECTION | MOVE_STEP)) {
 		_mouseButton[0].setState(MBS_HANDLED);
 		// We got a left mouse down while already moving in any direction or holding the step button.
 		// CHECKME: check what needs to happen when keeping left pressed