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

[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:
e91dda10ff ULTIMA8: const correctness
e4ece2a62c ULTIMA8: Allow turning while retreating in Crusader


Commit: e91dda10ffd59c1b7a8ad06eebafbd109ba8e8c7
    https://github.com/scummvm/scummvm/commit/e91dda10ffd59c1b7a8ad06eebafbd109ba8e8c7
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-11T13:56:54+09:00

Commit Message:
ULTIMA8: const correctness

Changed paths:
    engines/ultima/ultima8/filesys/raw_archive.cpp
    engines/ultima/ultima8/filesys/raw_archive.h


diff --git a/engines/ultima/ultima8/filesys/raw_archive.cpp b/engines/ultima/ultima8/filesys/raw_archive.cpp
index 609f30cf45..d94e7071a7 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.cpp
+++ b/engines/ultima/ultima8/filesys/raw_archive.cpp
@@ -81,7 +81,7 @@ uint8 *RawArchive::get_object(uint32 index) {
 	return getRawObject(index);
 }
 
-uint32 RawArchive::get_size(uint32 index) {
+uint32 RawArchive::get_size(uint32 index) const {
 	if (index >= _count)
 		return 0;
 	return getRawSize(index);
diff --git a/engines/ultima/ultima8/filesys/raw_archive.h b/engines/ultima/ultima8/filesys/raw_archive.h
index b5d35a29e4..d9e5fb15db 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.h
+++ b/engines/ultima/ultima8/filesys/raw_archive.h
@@ -50,7 +50,7 @@ public:
 	virtual uint8 *get_object(uint32 index);
 
 	//! get size of object
-	virtual uint32 get_size(uint32 index);
+	virtual uint32 get_size(uint32 index) const;
 
 	//! return object as SeekableReadStream. Delete the SeekableReadStream afterwards,
 	//! but DON'T delete/modify the buffer it points to.


Commit: e4ece2a62ca0854dc2fa1fefea25fb1f75a4aa58
    https://github.com/scummvm/scummvm/commit/e4ece2a62ca0854dc2fa1fefea25fb1f75a4aa58
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-11T13:58:13+09:00

Commit Message:
ULTIMA8: Allow turning while retreating in Crusader

The original game allows you to turn while retreating, but that was not
previously possible.

To make the turn always possible, step() now does not wait for the movement
animation.  This should work as AvatarMoverProcess::run terminates early if the
Avatar is busy.

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 4359c9064f..2a3eec1905 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -67,7 +67,7 @@ void CruAvatarMoverProcess::run() {
 		if (_avatarAngle < 0) {
 			_avatarAngle = Direction_ToCentidegrees(avatar->getDir());
 		}
-		if (!hasMovementFlags(MOVE_FORWARD | MOVE_BACK | MOVE_JUMP | MOVE_STEP)) {
+		if (!hasMovementFlags(MOVE_FORWARD | MOVE_JUMP | MOVE_STEP)) {
 			// See comment on _avatarAngle in header about these constants
 			if (hasMovementFlags(MOVE_TURN_LEFT)) {
 				if (hasMovementFlags(MOVE_RUN))
@@ -509,7 +509,7 @@ void CruAvatarMoverProcess::step(Animation::Sequence action, Direction direction
 		return;
 
 	//debug(6, "Cru avatar step: picked action %d dir %d (test result %d)", action, direction, res);
-	waitFor(avatar->doAnim(action, direction));
+	avatar->doAnim(action, direction);
 }
 
 void CruAvatarMoverProcess::tryAttack() {