[Scummvm-git-logs] scummvm master -> 5b3c5941ca2b98a75365512cf5ae099963691fd4

[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:
5b3c5941ca ULTIMA8: Use combat cursor until combat run starts to match orginal game


Commit: 5b3c5941ca2b98a75365512cf5ae099963691fd4
    https://github.com/scummvm/scummvm/commit/5b3c5941ca2b98a75365512cf5ae099963691fd4
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-19T20:07:32-06:00

Commit Message:
ULTIMA8: Use combat cursor until combat run starts to match orginal game

Changed paths:
    engines/ultima/ultima8/kernel/mouse.cpp


diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 066c3a35e91..5dd1b196841 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -209,9 +209,11 @@ int Mouse::getMouseFrame() {
 			return -1;
 
 		bool combat = false;
+		bool combatRun = false;
 		const MainActor *av = getMainActor();
 		if (av) {
 			combat = av->isInCombat();
+			combatRun = av->hasActorFlags(Actor::ACT_COMBATRUN);
 		}
 
 		// Calculate frame based on direction
@@ -224,12 +226,13 @@ int Mouse::getMouseFrame() {
 		 *    2             16
 		 *  combat          25
 		 **/
-		int offset = getMouseLength() * 8;
-		if (combat && offset != 16) //combat mouse is off if running
-			offset = 25;
+		int offset = 25;
+		if (!combat || combatRun) //combat mouse is off if running
+			offset = getMouseLength() * 8;
 		return frame + offset;
 	}
-					 //!! constants...
+
+	//!! constants...
 	case MOUSE_NONE:
 		return -1;
 	case MOUSE_TARGET: