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

[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:
674541349f ULTIMA8: Fix compile warning
fba2bfcdeb ULTIMA8: Tweak crusader movement more like original


Commit: 674541349fbf188320322ddb31e9b6e72272d666
    https://github.com/scummvm/scummvm/commit/674541349fbf188320322ddb31e9b6e72272d666
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T14:18:15+09:00

Commit Message:
ULTIMA8: Fix compile warning

Changed paths:
    engines/ultima/ultima8/graphics/fonts/tt_font.cpp


diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp b/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
index a200344896..7936d62e0b 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
@@ -197,7 +197,7 @@ RenderedText *TTFont::renderText(const Std::string &text, unsigned int &remainin
 						}
 					}
 				} else if (_antiAliased) {
-					uint32 pixColor = *((uint32 *)(surfrow + x * 4));
+					uint32 pixColor = *((const uint32 *)(surfrow + x * 4));
 					if (pixColor == 0)
 						continue;
 


Commit: fba2bfcdeb195e1b7ef0229744a2d8a56140b74d
    https://github.com/scummvm/scummvm/commit/fba2bfcdeb195e1b7ef0229744a2d8a56140b74d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T14:18:15+09:00

Commit Message:
ULTIMA8: Tweak crusader movement more like original

* Go straight from combat to walking forward (no stow weapon animation)
* Turn faster (don't animate current direction stand first)

Changed paths:
    engines/ultima/ultima8/world/actors/actor.cpp
    engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp


diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index d0ddebc3d9..4c3507b078 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -625,7 +625,13 @@ uint16 Actor::turnTowardDir(Direction targetdir) {
 	}
 
 	bool done = false;
-	for (Direction dir = curdir; !done; dir = Direction_TurnByDelta(dir, stepDelta, mode)) {
+	Direction firstanimdir = curdir;
+
+	// Skip animating "stand" for the current direction in Crusader.
+	if (GAME_IS_CRUSADER)
+		firstanimdir = Direction_TurnByDelta(curdir, stepDelta, mode);
+
+	for (Direction dir = firstanimdir; !done; dir = Direction_TurnByDelta(dir, stepDelta, mode)) {
 		Animation::Sequence nextanim = turnanim;
 		if (dir == targetdir) {
 			nextanim = standanim;
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 2405b6f1c6..2c052b4f6c 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -132,7 +132,8 @@ void CruAvatarMoverProcess::handleCombatMode() {
 			avatar->toggleInCombat();
 		}
 
-		nextanim = Animation::checkWeapon(nextanim, lastanim);
+		// don't check weapon here, Avatar can go straight from drawn-weapon to
+		// walking forward.
 		step(nextanim, direction);
 		return;
 	} else if (hasMovementFlags(MOVE_BACK)) {