[Scummvm-git-logs] scummvm master -> 3bd3fe6b043145bbdf91bac00e68e7c949472d12

[AndywinXp]

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:
3bd3fe6b04 SCUMM: INDY4: Properly fix #1265


Commit: 3bd3fe6b043145bbdf91bac00e68e7c949472d12
    https://github.com/scummvm/scummvm/commit/3bd3fe6b043145bbdf91bac00e68e7c949472d12
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-10-17T00:49:38+02:00

Commit Message:
SCUMM: INDY4: Properly fix #1265

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index faaf24177d3..e2cd4245b4a 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -767,7 +767,8 @@ void ScummEngine_v5::o5_animateActor() {
 	// animateCostume(31,255), with 86 and 31 being script numbers used as
 	// (way out of range) actor numbers. This seems to be yet another script
 	// bug which the original engine let slip by.
-	if (_game.id == GID_INDY4 && vm.slot[_currentScript].number == 206 && _currentRoom == 17 && (act == 31 || act == 86)) {
+	// For more information about why this happens, see o5_getActorRoom().
+	if (!isValidActor(act)) {
 		return;
 	}