thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASYLUM: identify a couple ActorStatus values

Browse source
This commit is contained in:
Alex Bevilacqua 2011-09-25 20:01:15 -04:00 • committed by Eugene Sandulenko
parent 2c1b1d3cf4
commit 68b9df5a4b
No known key found for this signature in database
GPG key ID: 014D387312D34F08
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/asylum/resources/actor.cpp
View file

@ -544,7 +544,7 @@ void Actor::update() {
} }
// Fallback to next case // Fallback to next case
case kActorStatus1: { case kActorStatusWalking: {
uint32 index = (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex; uint32 index = (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex;
uint32 dist = (uint32)abs((double)getDistanceForFrame(_direction, index)); uint32 dist = (uint32)abs((double)getDistanceForFrame(_direction, index));
@ -577,7 +577,7 @@ void Actor::update() {
} }
break; break;
case kActorStatus2: case kActorStatusWalkingTo:
case kActorStatus13: { case kActorStatus13: {
uint32 index = (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex; uint32 index = (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex;
@ -701,7 +701,7 @@ void Actor::updateStatus(ActorStatus actorStatus) {
default: default:
break; break;
case kActorStatus1: case kActorStatusWalking:
case kActorStatus12: case kActorStatus12:
if ((getWorld()->chapter == kChapter2 if ((getWorld()->chapter == kChapter2
&& _index == getSharedData()->getPlayerIndex() && (_status == kActorStatus18 || _status == kActorStatus16 || _status == kActorStatus17)) && _index == getSharedData()->getPlayerIndex() && (_status == kActorStatus18 || _status == kActorStatus16 || _status == kActorStatus17))
@ -717,7 +717,7 @@ void Actor::updateStatus(ActorStatus actorStatus) {
} }
break; break;
case kActorStatus2: case kActorStatusWalkingTo:
case kActorStatus13: case kActorStatus13:
updateGraphicData(0); updateGraphicData(0);
break; break;
@ -1048,8 +1048,8 @@ void Actor::updateFromDirection(ActorDirection actorDirection) {
_resourceId = _graphicResourceIds[(actorDirection > kDirectionS) ? kDirection8 - actorDirection : actorDirection]; _resourceId = _graphicResourceIds[(actorDirection > kDirectionS) ? kDirection8 - actorDirection : actorDirection];
break; break;
case kActorStatus1: case kActorStatusWalking:
case kActorStatus2: case kActorStatusWalkingTo:
case kActorStatus12: case kActorStatus12:
_resourceId = _graphicResourceIds[(actorDirection > kDirectionS ? kDirection8 - actorDirection : actorDirection)]; _resourceId = _graphicResourceIds[(actorDirection > kDirectionS ? kDirection8 - actorDirection : actorDirection)];
break; break;
@ -1469,7 +1469,7 @@ bool Actor::process(const Common::Point &point) {
void Actor::processStatus(int16 actorX, int16 actorY, bool doSpeech) { void Actor::processStatus(int16 actorX, int16 actorY, bool doSpeech) {
if (process(Common::Point(actorX, actorY))) { if (process(Common::Point(actorX, actorY))) {
if (_status <= kActorStatus11) if (_status <= kActorStatus11)
updateStatus(kActorStatus2); updateStatus(kActorStatusWalkingTo);
else else
updateStatus(kActorStatus13); updateStatus(kActorStatus13);
} else if (doSpeech) { } else if (doSpeech) {
@ -1743,8 +1743,8 @@ void Actor::move(ActorDirection actorDir, uint32 dist) {
default: default:
break; break;
case kActorStatus1: case kActorStatusWalking:
case kActorStatus2: case kActorStatusWalkingTo:
case kActorStatus12: case kActorStatus12:
case kActorStatus13: case kActorStatus13:
updateCoordinatesForDirection(actorDir, (int16)dist, &_point1); updateCoordinatesForDirection(actorDir, (int16)dist, &_point1);

4
engines/asylum/resources/script.cpp
View file

@ -700,7 +700,7 @@ END_OPCODE
IMPLEMENT_OPCODE(JumpAndSetDirection) IMPLEMENT_OPCODE(JumpAndSetDirection)
Actor *actor = getScene()->getActor(cmd->param1); 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->param5 != 2) {
if (cmd->param2 == -1 || cmd->param3 == -1) { if (cmd->param2 == -1 || cmd->param3 == -1) {
@ -1703,7 +1703,7 @@ END_OPCODE
IMPLEMENT_OPCODE(Interact) IMPLEMENT_OPCODE(Interact)
Actor *actor = getScene()->getActor(cmd->param2 == 2 ? kActorInvalid : cmd->param1); 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) if (cmd->param2 == 2)
_processNextEntry = true; _processNextEntry = true;

4
engines/asylum/resources/special.cpp
View file

@ -222,7 +222,7 @@ void Special::chapter2(Object *object, ActorIndex actorIndex) {
case 15: case 15:
case 17: case 17:
case 18: case 18:
if (actor->getStatus() == kActorStatus1) { if (actor->getStatus() == kActorStatusWalking) {
int32 counter = getSharedData()->getChapter2Counter(getCounter(actorIndex)); int32 counter = getSharedData()->getChapter2Counter(getCounter(actorIndex));
counter++; counter++;
@ -234,7 +234,7 @@ void Special::chapter2(Object *object, ActorIndex actorIndex) {
getSharedData()->setChapter2Counter(4, counter); getSharedData()->setChapter2Counter(4, counter);
} else if (actor->getStatus() == kActorStatusEnabled) { } else if (actor->getStatus() == kActorStatusEnabled) {
actor->updateStatus(kActorStatus1); actor->updateStatus(kActorStatusWalking);
} }
break; break;

6
engines/asylum/shared.h
View file

@ -389,10 +389,10 @@ enum ActorIndexes {
enum ActorStatus { enum ActorStatus {
kActorStatusNone = 0, kActorStatusNone = 0,
kActorStatus1 = 1, kActorStatusWalking = 1, // Walking
kActorStatus2, kActorStatusWalkingTo, // Auto-walking to target
kActorStatus3, kActorStatus3,
kActorStatusEnabled, kActorStatusEnabled, // Standing Still
kActorStatusDisabled, // 5 kActorStatusDisabled, // 5
kActorStatus6, kActorStatus6,
kActorStatus7, kActorStatus7,

8
engines/asylum/views/scene.cpp
View file

@ -332,7 +332,7 @@ bool Scene::handleEvent(const AsylumEvent &evt) {
void Scene::activate() { void Scene::activate() {
Actor *player = getActor(); Actor *player = getActor();
if (player->getStatus() == kActorStatus1) if (player->getStatus() == kActorStatusWalking)
player->updateStatus(kActorStatusEnabled); player->updateStatus(kActorStatusEnabled);
if (player->getStatus() == kActorStatus12) if (player->getStatus() == kActorStatus12)
@ -538,7 +538,7 @@ bool Scene::clickDown(const AsylumEvent &evt) {
player->updateStatus(kActorStatusEnabled); player->updateStatus(kActorStatusEnabled);
getSound()->playSound(MAKE_RESOURCE(kResourcePackSound, 5)); getSound()->playSound(MAKE_RESOURCE(kResourcePackSound, 5));
} else if (player->getStatus() != kActorStatusDisabled) { } else if (player->getStatus() != kActorStatusDisabled) {
player->updateStatus(kActorStatus1); player->updateStatus(kActorStatusWalking);
} }
break; break;
@ -809,7 +809,7 @@ void Scene::updateMouse() {
updateCursor(newDirection, actorRect); updateCursor(newDirection, actorRect);
if (newDirection >= kDirectionN) if (newDirection >= kDirectionN)
if (player->getStatus() == kActorStatus1 || player->getStatus() == kActorStatus12) if (player->getStatus() == kActorStatusWalking || player->getStatus() == kActorStatus12)
player->updateFromDirection(newDirection); player->updateFromDirection(newDirection);
} }
@ -1140,7 +1140,7 @@ void Scene::updateCursor(ActorDirection direction, const Common::Rect &rect) {
} }
if (getCursor()->getState() & kCursorStateRight) { if (getCursor()->getState() & kCursorStateRight) {
if (player->getStatus() == kActorStatus1 || player->getStatus() == kActorStatus12) { if (player->getStatus() == kActorStatusWalking || player->getStatus() == kActorStatus12) {
ResourceId resourceId =_ws->cursorResources[direction]; ResourceId resourceId =_ws->cursorResources[direction];