diff --git a/engines/asylum/resources/actor.cpp b/engines/asylum/resources/actor.cpp index 0c5142d3d63..fce272db414 100644 --- a/engines/asylum/resources/actor.cpp +++ b/engines/asylum/resources/actor.cpp @@ -544,7 +544,7 @@ void Actor::update() { } // Fallback to next case - case kActorStatus1: { + case kActorStatusWalking: { uint32 index = (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex; uint32 dist = (uint32)abs((double)getDistanceForFrame(_direction, index)); @@ -577,7 +577,7 @@ void Actor::update() { } break; - case kActorStatus2: + case kActorStatusWalkingTo: case kActorStatus13: { uint32 index = (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex; @@ -701,7 +701,7 @@ void Actor::updateStatus(ActorStatus actorStatus) { default: break; - case kActorStatus1: + case kActorStatusWalking: case kActorStatus12: if ((getWorld()->chapter == kChapter2 && _index == getSharedData()->getPlayerIndex() && (_status == kActorStatus18 || _status == kActorStatus16 || _status == kActorStatus17)) @@ -717,7 +717,7 @@ void Actor::updateStatus(ActorStatus actorStatus) { } break; - case kActorStatus2: + case kActorStatusWalkingTo: case kActorStatus13: updateGraphicData(0); break; @@ -1048,8 +1048,8 @@ void Actor::updateFromDirection(ActorDirection actorDirection) { _resourceId = _graphicResourceIds[(actorDirection > kDirectionS) ? kDirection8 - actorDirection : actorDirection]; break; - case kActorStatus1: - case kActorStatus2: + case kActorStatusWalking: + case kActorStatusWalkingTo: case kActorStatus12: _resourceId = _graphicResourceIds[(actorDirection > kDirectionS ? kDirection8 - actorDirection : actorDirection)]; break; @@ -1469,7 +1469,7 @@ bool Actor::process(const Common::Point &point) { void Actor::processStatus(int16 actorX, int16 actorY, bool doSpeech) { if (process(Common::Point(actorX, actorY))) { if (_status <= kActorStatus11) - updateStatus(kActorStatus2); + updateStatus(kActorStatusWalkingTo); else updateStatus(kActorStatus13); } else if (doSpeech) { @@ -1743,8 +1743,8 @@ void Actor::move(ActorDirection actorDir, uint32 dist) { default: break; - case kActorStatus1: - case kActorStatus2: + case kActorStatusWalking: + case kActorStatusWalkingTo: case kActorStatus12: case kActorStatus13: updateCoordinatesForDirection(actorDir, (int16)dist, &_point1); diff --git a/engines/asylum/resources/script.cpp b/engines/asylum/resources/script.cpp index 1fbbadf44a2..61cabf97b16 100644 --- a/engines/asylum/resources/script.cpp +++ b/engines/asylum/resources/script.cpp @@ -700,7 +700,7 @@ END_OPCODE IMPLEMENT_OPCODE(JumpAndSetDirection) Actor *actor = getScene()->getActor(cmd->param1); - if (actor->getStatus() != kActorStatus2 && actor->getStatus() != kActorStatus13) { + if (actor->getStatus() != kActorStatusWalkingTo && actor->getStatus() != kActorStatus13) { if (cmd->param5 != 2) { if (cmd->param2 == -1 || cmd->param3 == -1) { @@ -1703,7 +1703,7 @@ END_OPCODE IMPLEMENT_OPCODE(Interact) Actor *actor = getScene()->getActor(cmd->param2 == 2 ? kActorInvalid : cmd->param1); - if (actor->getStatus() == kActorStatus2 || actor->getStatus() == kActorStatus13) { + if (actor->getStatus() == kActorStatusWalkingTo || actor->getStatus() == kActorStatus13) { if (cmd->param2 == 2) _processNextEntry = true; diff --git a/engines/asylum/resources/special.cpp b/engines/asylum/resources/special.cpp index 0ba655e97d3..b0108cbe7ba 100644 --- a/engines/asylum/resources/special.cpp +++ b/engines/asylum/resources/special.cpp @@ -222,7 +222,7 @@ void Special::chapter2(Object *object, ActorIndex actorIndex) { case 15: case 17: case 18: - if (actor->getStatus() == kActorStatus1) { + if (actor->getStatus() == kActorStatusWalking) { int32 counter = getSharedData()->getChapter2Counter(getCounter(actorIndex)); counter++; @@ -234,7 +234,7 @@ void Special::chapter2(Object *object, ActorIndex actorIndex) { getSharedData()->setChapter2Counter(4, counter); } else if (actor->getStatus() == kActorStatusEnabled) { - actor->updateStatus(kActorStatus1); + actor->updateStatus(kActorStatusWalking); } break; diff --git a/engines/asylum/shared.h b/engines/asylum/shared.h index c506e341290..96f94fcae48 100644 --- a/engines/asylum/shared.h +++ b/engines/asylum/shared.h @@ -389,10 +389,10 @@ enum ActorIndexes { enum ActorStatus { kActorStatusNone = 0, - kActorStatus1 = 1, - kActorStatus2, + kActorStatusWalking = 1, // Walking + kActorStatusWalkingTo, // Auto-walking to target kActorStatus3, - kActorStatusEnabled, + kActorStatusEnabled, // Standing Still kActorStatusDisabled, // 5 kActorStatus6, kActorStatus7, diff --git a/engines/asylum/views/scene.cpp b/engines/asylum/views/scene.cpp index 575591c14c2..461fb892595 100644 --- a/engines/asylum/views/scene.cpp +++ b/engines/asylum/views/scene.cpp @@ -332,7 +332,7 @@ bool Scene::handleEvent(const AsylumEvent &evt) { void Scene::activate() { Actor *player = getActor(); - if (player->getStatus() == kActorStatus1) + if (player->getStatus() == kActorStatusWalking) player->updateStatus(kActorStatusEnabled); if (player->getStatus() == kActorStatus12) @@ -538,7 +538,7 @@ bool Scene::clickDown(const AsylumEvent &evt) { player->updateStatus(kActorStatusEnabled); getSound()->playSound(MAKE_RESOURCE(kResourcePackSound, 5)); } else if (player->getStatus() != kActorStatusDisabled) { - player->updateStatus(kActorStatus1); + player->updateStatus(kActorStatusWalking); } break; @@ -809,7 +809,7 @@ void Scene::updateMouse() { updateCursor(newDirection, actorRect); if (newDirection >= kDirectionN) - if (player->getStatus() == kActorStatus1 || player->getStatus() == kActorStatus12) + if (player->getStatus() == kActorStatusWalking || player->getStatus() == kActorStatus12) player->updateFromDirection(newDirection); } @@ -1140,7 +1140,7 @@ void Scene::updateCursor(ActorDirection direction, const Common::Rect &rect) { } if (getCursor()->getState() & kCursorStateRight) { - if (player->getStatus() == kActorStatus1 || player->getStatus() == kActorStatus12) { + if (player->getStatus() == kActorStatusWalking || player->getStatus() == kActorStatus12) { ResourceId resourceId =_ws->cursorResources[direction];