ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASYLUM: Implement Actor::updateStatus15_Chapter11_Player()

Browse Source
This commit is contained in:
Julien Templier
2021-05-17 15:36:55 +02:00
committed by Eugene Sandulenko
parent 92968813ea
commit 9b92fc5e64
3 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/asylum/resources/actor.cpp
+54 -1
View File
@@ -1721,7 +1721,60 @@ void Actor::updateStatus15_Chapter11() {
}
void Actor::updateStatus15_Chapter11_Player() {
error("[Actor::updateStatus15_Chapter11_Player] not implemented!");
_frameIndex++;
if (_frameIndex == 17) {
getSpeech()->playPlayer(130);
if (getWorld()->field_E849C >= 666) {
if (_vm->isGameFlagSet(kGameFlag583)) {
_vm->setGameFlag(kGameFlag582);
_vm->clearGameFlag(kGameFlag565);
++getWorld()->field_E8518;
getSound()->playSound(getWorld()->soundResourceIds[2]);
}
} else {
Actor *actor2 = getScene()->getActor(getWorld()->field_E849C);
double diffX = (actor2->getPoint1()->x + actor2->getPoint2()->x) - (_point1.x + _point2.x);
double diffY = (actor2->getPoint1()->y + actor2->getPoint2()->y) - (_point1.y + _point2.y);
if (sqrt(diffX * diffX + diffY * diffY) < 75.0f
&& (actor2->getStatus() == kActorStatus14 || actor2->getStatus() == kActorStatus15)) {
getSound()->playSound(getWorld()->soundResourceIds[2]);
switch (getWorld()->field_E849C) {
default:
break;
case 10:
_vm->setGameFlag(kGameFlag563);
break;
case 11:
_vm->setGameFlag(kGameFlag724);
break;
case 12:
_vm->setGameFlag(kGameFlag727);
break;
case 13:
_vm->setGameFlag(kGameFlag730);
break;
}
actor2->updateStatus(kActorStatus17);
}
}
}
if (_frameIndex >= _frameCount) {
getCursor()->show();
getSharedData()->setFlag(kFlag1, false);
_frameIndex = 0;
updateStatus(kActorStatus14);
}
}
void Actor::updateStatus16_Chapter2() {
engines/asylum/resources/worldstats.h
+1 -1
View File
@@ -133,7 +133,7 @@ public:
int32 field_E8490;
int32 field_E8494;
int32 field_E8498;
int32 field_E849C;
int32 field_E849C; // ActorIndex???
int32 tickValueArray[30];
int32 field_E8518;
int32 field_E851C[30];
engines/asylum/shared.h
+7
View File
@@ -119,12 +119,19 @@ enum GameFlag {
kGameFlag553 = 553,
kGameFlag556 = 556,
kGameFlag560 = 560,
kGameFlag563 = 563,
kGameFlag565 = 565,
kGameFlag570 = 570,
kGameFlag582 = 582,
kGameFlag583 = 583,
kGameFlag608 = 608,
kGameFlag619 = 619,
kGameFlag635 = 635,
kGameFlag636 = 636,
kGameFlag637 = 637,
kGameFlag724 = 724,
kGameFlag727 = 727,
kGameFlag730 = 730,
kGameFlag776 = 776,
kGameFlag801 = 801,
kGameFlag802 = 802,