[Scummvm-git-logs] scummvm master -> 0c49d7480ffcf9a3be340a26dd90989bf6e224b6

[bluegr]

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:
0c49d7480f GOB: Fix Blount becoming inactive in the Gob3 brain level - bug #5760


Commit: 0c49d7480ffcf9a3be340a26dd90989bf6e224b6
    https://github.com/scummvm/scummvm/commit/0c49d7480ffcf9a3be340a26dd90989bf6e224b6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-29T23:17:14+02:00

Commit Message:
GOB: Fix Blount becoming inactive in the Gob3 brain level - bug #5760

Changed paths:
    engines/gob/goblin_v2.cpp


diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp
index aa85a34c422..1e4b2f72250 100644
--- a/engines/gob/goblin_v2.cpp
+++ b/engines/gob/goblin_v2.cpp
@@ -102,6 +102,15 @@ void Goblin_v2::placeObject(Gob_Object *objDesc, char animated,
 			objAnim->isPaused = 0;
 			objAnim->isStatic = 0;
 			objAnim->newCycle = _vm->_scenery->getAnimLayer(animation, layer)->framesCount;
+
+			// WORKAROUND: In the brain level of Gob3, where Blount and Were-blount are
+			// separated, Blount may be declared as inactive and can't move when exiting
+			// and reentering the level - bug #5760.
+			// Change his animation type here to mark him as enabled
+			if (_vm->getGameType() == kGameTypeGob3 && _vm->isCurrentTot("EMAP1018.TOT") && index == 0 &&
+				x == 3 && y == 33 && state == 9 && layer == 27 && animation == 0 && objAnim->animType == 1)
+				objAnim->animType = 100;
+
 			_vm->_scenery->updateAnim(layer, 0, animation, 0, *obj->pPosX, *obj->pPosY, 0);
 			if (!_vm->_map->hasBigTiles())
 				*obj->pPosY = (y + 1) * _vm->_map->getTilesHeight()