From 8eb94fc95e3504ceac00a6a8bd6fbe16018bb65b Mon Sep 17 00:00:00 2001 From: alxpnv Date: Tue, 13 Apr 2021 11:25:58 +0300 Subject: [PATCH] ASYLUM: restart chapter 11 properly --- engines/asylum/resources/actor.cpp | 5 ++--- engines/asylum/resources/special.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engines/asylum/resources/actor.cpp b/engines/asylum/resources/actor.cpp index b6120754e5e..3cbf05bc620 100644 --- a/engines/asylum/resources/actor.cpp +++ b/engines/asylum/resources/actor.cpp @@ -520,7 +520,7 @@ void Actor::update() { case 1: getSpecial()->run(NULL, _index); - break; + return; case 10: case 11: @@ -3163,8 +3163,7 @@ void Actor::updateStatus16_Chapter11() { _frameIndex = 0; getScene()->getActor(0)->updateStatus(kActorStatusRestarting); - - _tickCount = _vm->getTick() + 2000; + getScene()->getActor(1)->setTickCount(_vm->getTick() + 2000); } else { getScene()->getActor(0)->updateStatus(kActorStatusEnabled2); } diff --git a/engines/asylum/resources/special.cpp b/engines/asylum/resources/special.cpp index be5f3edf2c6..ce13bccac18 100644 --- a/engines/asylum/resources/special.cpp +++ b/engines/asylum/resources/special.cpp @@ -991,7 +991,7 @@ void Special::chapter11(Object *object, ActorIndex actorIndex) { actor1->updateStatus(kActorStatusEnabled); actor0->updateStatus(kActorStatusEnabled); getWorld()->field_E848C = 0; - getScript()->queueScript(getWorld()->getActionAreaIndexById(1574), kActorSarah); + getScript()->queueScript(getWorld()->actions[getWorld()->getActionAreaIndexById(1574)]->scriptIndex, kActorSarah); } } }