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

[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:
3d5d5317a8 TWINE: fixed invalid processActor reset


Commit: 3d5d5317a88b8e96b220ad65b0d930c93dd024bb
    https://github.com/scummvm/scummvm/commit/3d5d5317a88b8e96b220ad65b0d930c93dd024bb
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-12-28T21:20:58+01:00

Commit Message:
TWINE: fixed invalid processActor reset

was the cause of this blocker bug: https://bugs.scummvm.org/ticket/13177

the _processCollision variable is overwritten in getBrickShape and the 'backup' is lost

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


diff --git a/engines/twine/scene/animations.cpp b/engines/twine/scene/animations.cpp
index f1817fa955c..453472f00e2 100644
--- a/engines/twine/scene/animations.cpp
+++ b/engines/twine/scene/animations.cpp
@@ -668,7 +668,7 @@ void Animations::processActorAnimations(int32 actorIdx) {
 
 		_engine->_collision->_causeActorDamage = 0;
 
-		_engine->_collision->_processCollision = processActor;
+		const IVec3 processActorSave = processActor;
 
 		if (IS_HERO(actorIdx) && !actor->_staticFlags.bComputeLowCollision) {
 			// check hero collisions with bricks
@@ -683,6 +683,7 @@ void Animations::processActorAnimations(int32 actorIdx) {
 			_engine->_collision->checkActorCollisionWithBricks(actor->_boudingBox.maxs.x, actor->_boudingBox.mins.y, actor->_boudingBox.maxs.z, 4);
 			_engine->_collision->checkActorCollisionWithBricks(actor->_boudingBox.mins.x, actor->_boudingBox.mins.y, actor->_boudingBox.maxs.z, 8);
 		}
+		processActor = processActorSave;
 
 		// process wall hit while running
 		if (_engine->_collision->_causeActorDamage && !actor->_dynamicFlags.bIsFalling && IS_HERO(_currentlyProcessedActorIdx) && _engine->_actor->_heroBehaviour == HeroBehaviourType::kAthletic && actor->_anim == AnimationTypes::kForward) {