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

[sev-]

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:
bd302f4c19 AVALANCHE: Update direction arrow when mouse is used to move
aa46426a3a AVALANCHE: Use correct sprite data during arrow trap


Commit: bd302f4c199ca59dacf15ffed234b1e6ebc84eec
    https://github.com/scummvm/scummvm/commit/bd302f4c199ca59dacf15ffed234b1e6ebc84eec
Author: Avijeet (am388488 at gmail.com)
Date: 2022-09-07T23:12:38+02:00

Commit Message:
AVALANCHE: Update direction arrow when mouse is used to move

Changed paths:
    engines/avalanche/avalot.cpp


diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index eded265f3a8..53666bbe948 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1079,30 +1079,39 @@ void AvalancheEngine::guideAvvy(Common::Point cursorPos) {
 	case 0:
 	default:
 		_animation->stopWalking();
+		_animation->setDirection(kDirStopped);
 		break; // Clicked on Avvy: no movement.
 	case 1:
 		_animation->setMoveSpeed(0, kDirLeft);
+		_animation->setDirection(kDirLeft);
 		break;
 	case 2:
 		_animation->setMoveSpeed(0, kDirRight);
+		_animation->setDirection(kDirRight);
 		break;
 	case 3:
 		_animation->setMoveSpeed(0, kDirUp);
+		_animation->setDirection(kDirUp);
 		break;
 	case 4:
 		_animation->setMoveSpeed(0, kDirUpLeft);
+		_animation->setDirection(kDirLeft);
 		break;
 	case 5:
 		_animation->setMoveSpeed(0, kDirUpRight);
+		_animation->setDirection(kDirUpRight);
 		break;
 	case 6:
 		_animation->setMoveSpeed(0, kDirDown);
+		_animation->setDirection(kDirDown);
 		break;
 	case 7:
 		_animation->setMoveSpeed(0, kDirDownLeft);
+		_animation->setDirection(kDirDownLeft);
 		break;
 	case 8:
 		_animation->setMoveSpeed(0, kDirDownRight);
+		_animation->setDirection(kDirDownRight);
 		break;
 	}    // No other values are possible.
 


Commit: aa46426a3a5dbdad5471ce515654051d7fedc2c2
    https://github.com/scummvm/scummvm/commit/aa46426a3a5dbdad5471ce515654051d7fedc2c2
Author: Avijeet (am388488 at gmail.com)
Date: 2022-09-07T23:12:38+02:00

Commit Message:
AVALANCHE: Use correct sprite data during arrow trap

Changed paths:
    engines/avalanche/animation.cpp


diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index cd3eb8bc8e1..4eb1475301d 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -1053,7 +1053,7 @@ void Animation::faceAvvy(byte tripnum) {
 
 void Animation::arrowProcs(byte tripnum) {
 	AnimationType *tripSpr = _sprites[tripnum];
-	AnimationType *avvy = _sprites[tripnum];
+	AnimationType *avvy = _sprites[0];
 
 	if (tripSpr->_homing) {
 		// Arrow is still in flight.