[Scummvm-git-logs] scummvm master -> 11ffa1922ff1e67e4ce866b295bff99b14f18fbf

[mgerhardy]

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:
c3c24a382e TWINE: Meca Penguin not working
11ffa1922f TWINE: fixed protopack not working


Commit: c3c24a382e4364df8b684d8f19524d20aab1809c
    https://github.com/scummvm/scummvm/commit/c3c24a382e4364df8b684d8f19524d20aab1809c
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-07-10T19:25:28+02:00

Commit Message:
TWINE: Meca Penguin not working

fixed bug https://bugs.scummvm.org/ticket/13665

Changed paths:
    engines/twine/twine.cpp


diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index a90a0a1e3c6..b0f6f97b2d9 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -712,7 +712,7 @@ void TwinEEngine::processInventoryAction() {
 
 		penguin->_angle = _scene->_sceneHero->_angle;
 
-		if (!_collision->checkValidObjPos(_scene->_mecaPenguinIdx)) {
+		if (_collision->checkValidObjPos(_scene->_mecaPenguinIdx)) {
 			penguin->setLife(kActorMaxLife);
 			penguin->_genBody = BodyType::btNone;
 			_actor->initModelActor(BodyType::btNormal, _scene->_mecaPenguinIdx);


Commit: 11ffa1922ff1e67e4ce866b295bff99b14f18fbf
    https://github.com/scummvm/scummvm/commit/11ffa1922ff1e67e4ce866b295bff99b14f18fbf
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-07-10T19:42:09+02:00

Commit Message:
TWINE: fixed protopack not working

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


diff --git a/engines/twine/scene/actor.cpp b/engines/twine/scene/actor.cpp
index 66f68a106c5..a5f8926764d 100644
--- a/engines/twine/scene/actor.cpp
+++ b/engines/twine/scene/actor.cpp
@@ -116,7 +116,7 @@ void Actor::setBehaviour(HeroBehaviourType behaviour) {
 		_heroBehaviour = behaviour;
 		sceneHero->_entityDataPtr = &_heroEntityPROTOPACK;
 		break;
-	};
+	}
 
 	const BodyType bodyIdx = sceneHero->_genBody;
 
@@ -171,7 +171,7 @@ void Actor::initModelActor(BodyType bodyIdx, int16 actorIdx) {
 
 	debug(1, "Load body %i for actor %i", (int)bodyIdx, actorIdx);
 
-	if (IS_HERO(actorIdx) && _heroBehaviour == HeroBehaviourType::kProtoPack && localActor->_genBody != BodyType::btTunic && localActor->_genBody != BodyType::btNormal) {
+	if (IS_HERO(actorIdx) && _heroBehaviour == HeroBehaviourType::kProtoPack && bodyIdx != BodyType::btTunic && bodyIdx != BodyType::btNormal) {
 		setBehaviour(HeroBehaviourType::kNormal);
 	}