[Scummvm-git-logs] scummvm master -> 94e339a382f7f417ca369602c882d4f3c5b8e0ce

[mgerhardy]

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:
94e339a382 TWINE: added hack to fix the sokoban scene and keep the tank moving


Commit: 94e339a382f7f417ca369602c882d4f3c5b8e0ce
    https://github.com/scummvm/scummvm/commit/94e339a382f7f417ca369602c882d4f3c5b8e0ce
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-07-11T07:37:59+02:00

Commit Message:
TWINE: added hack to fix the sokoban scene and keep the tank moving

Changed paths:
    engines/twine/scene/animations.cpp


diff --git a/engines/twine/scene/animations.cpp b/engines/twine/scene/animations.cpp
index 26b1137a2de..652d4529d81 100644
--- a/engines/twine/scene/animations.cpp
+++ b/engines/twine/scene/animations.cpp
@@ -687,7 +687,9 @@ void Animations::doAnim(int32 actorIdx) {
 			collision->doCornerReajust(actor, actor->_boundingBox.mins.x, actor->_boundingBox.mins.y, actor->_boundingBox.maxs.z, 8);
 		}
 		// TODO: hack to fix tank-not-moving bug https://bugs.scummvm.org/ticket/13177
-		processActor = processActorSave;
+		if (actorIdx == 1 && _engine->_scene->_currentSceneIdx == LBA1SceneId::Hamalayi_Mountains_2nd_fighting_scene) {
+			processActor = processActorSave;
+		}
 
 		// process wall hit while running
 		if (collision->_causeActorDamage && !actor->_dynamicFlags.bIsFalling && IS_HERO(_currentlyProcessedActorIdx) && _engine->_actor->_heroBehaviour == HeroBehaviourType::kAthletic && actor->_genAnim == AnimationTypes::kForward) {