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

ASYLUM: Rename some movement-related Actor methods

Browse source
This commit is contained in:
Julien Templier 2011-07-15 12:43:34 -04:00 • committed by Eugene Sandulenko
parent 3727e9a820
commit def09b8c20
No known key found for this signature in database
GPG key ID: 014D387312D34F08
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -478,16 +478,16 @@ void Actor::update() {
uint32 dist = abs((double)getDistanceForFrame(_direction, index));
Common::Point point = _point1 + _point2;
if (process_408B20(&point, _direction, dist, false)) {
playSounds(_direction, dist);
} else if (process_408B20(&point, (ActorDirection)((_direction + 1) % 7), dist, false)) {
playSounds((ActorDirection)((_direction + 1) % 7), dist);
} else if (process_408B20(&point, (ActorDirection)((_direction + 7) % 7), dist, false)) {
playSounds((ActorDirection)((_direction + 7) % 7), dist);
} else if (process_408B20(&point, (ActorDirection)((_direction + 2) % 7), dist, false)) {
playSounds((ActorDirection)((_direction + 2) % 7), dist);
} else if (process_408B20(&point, (ActorDirection)((_direction + 6) % 7), dist, false)) {
playSounds((ActorDirection)((_direction + 6) % 7), dist);
if (canMove(&point, _direction, dist, false)) {
move(_direction, dist);
} else if (canMove(&point, (ActorDirection)((_direction + 1) % 7), dist, false)) {
move((ActorDirection)((_direction + 1) % 7), dist);
} else if (canMove(&point, (ActorDirection)((_direction + 7) % 7), dist, false)) {
move((ActorDirection)((_direction + 7) % 7), dist);
} else if (canMove(&point, (ActorDirection)((_direction + 2) % 7), dist, false)) {
move((ActorDirection)((_direction + 2) % 7), dist);
} else if (canMove(&point, (ActorDirection)((_direction + 6) % 7), dist, false)) {
move((ActorDirection)((_direction + 6) % 7), dist);
}
// Finish
@ -518,8 +518,8 @@ void Actor::update() {
|| point.x > (int16)(current.x + (dist - 1))
|| point.y < (int16)(current.y - (dist - 1))
|| point.y > (int16)(current.y + (dist - 1))) {
if (process_408B20(&point, _direction, dist, false)) {
playSounds(_direction, dist);
if (canMove(&point, _direction, dist, false)) {
move(_direction, dist);
} else {
update_409230();
}
@ -533,7 +533,7 @@ void Actor::update() {
} else {
_frameIndex = (_frameIndex + 1) % _frameCount;
if (process_4103B0(&current, _direction)) {
if (canMoveCheckActors(&current, _direction)) {
_point1.x = dist - _point2.x;
_point1.y = current.y - _point2.y;
@ -947,7 +947,7 @@ bool Actor::process(const Common::Point &point) {
}
if (point == sum) {
if (process_408B20(&sum, a3 >= 2 ? kDirectionS : kDirectionN, abs(delta.y), false)) {
if (canMove(&sum, a3 >= 2 ? kDirectionS : kDirectionN, abs(delta.y), false)) {
_data.points[0] = point;
_data.current = 0;
_data.count = 1;
@ -958,7 +958,7 @@ bool Actor::process(const Common::Point &point) {
if (point.x == sum.x) {
ActorDirection actorDir = a3 >= 2 ? kDirectionS : kDirectionN;
if (process_408B20(&sum, actorDir, abs(delta.y), false)) {
if (canMove(&sum, actorDir, abs(delta.y), false)) {
_data.points[0] = point;
_data.current = 0;
_data.count = 1;
@ -974,7 +974,7 @@ bool Actor::process(const Common::Point &point) {
if (point.y == sum.y) {
ActorDirection actorDir = (a3 != 0 || a3 != 3) ? kDirectionE : kDirectionO;
if (process_408B20(&sum, actorDir, abs(delta.x), true)) {
if (canMove(&sum, actorDir, abs(delta.x), true)) {
_data.points[0] = point;
_data.current = 0;
_data.count = 1;
@ -1066,13 +1066,13 @@ bool Actor::process(const Common::Point &point) {
error("[Actor::process] not implemented (scene rects checks)!");
}
if (process_408B20(&sum, direction1, count1, true)
&& process_408B20(&point1, direction2, count2, true)) {
if (canMove(&sum, direction1, count1, true)
&& canMove(&point1, direction2, count2, true)) {
error("[Actor::process] not implemented (process actor data 1)!");
}
if (process_408B20(&sum, direction2, count2, true)
&& process_408B20(&point1, direction1, count1, true)) {
if (canMove(&sum, direction2, count2, true)
&& canMove(&point1, direction1, count1, true)) {
error("[Actor::process] not implemented (process actor data 2)!");
}
@ -1137,7 +1137,7 @@ bool Actor::process(const Common::Point &point) {
break;
}
if (!process_408B20(&sum, actorDir, abs(delta.y), true))
if (!canMove(&sum, actorDir, abs(delta.y), true))
return false;
// Update actor data
@ -1272,7 +1272,7 @@ bool Actor::process_4069B0(int32 *x, int32 *y) {
error("[Actor::process_4069B0] Not implemented!");
}
bool Actor::process_408B20(Common::Point *point, ActorDirection dir, uint32 count, bool hasDelta) {
bool Actor::canMove(Common::Point *point, ActorDirection dir, uint32 count, bool hasDelta) {
if (_field_944 == 1 || _field_944 == 4)
return true;
@ -1295,7 +1295,7 @@ bool Actor::process_408B20(Common::Point *point, ActorDirection dir, uint32 coun
if (y > rct.bottom)
return false;
if (!process_4103B0(point, dir))
if (!canMoveCheckActors(point, dir))
return false;
}
@ -1318,7 +1318,7 @@ bool Actor::process_408B20(Common::Point *point, ActorDirection dir, uint32 coun
return true;
}
void Actor::playSounds(ActorDirection actorDir, uint32 dist) {
void Actor::move(ActorDirection actorDir, uint32 dist) {
_lastScreenUpdate = _vm->screenUpdateCount;
Common::Point sum(_point1.x + _point2.x, _point1.x + _point2.x);
@ -1473,7 +1473,7 @@ bool Actor::process_41BDB0(int32 reactionIndex, int32 testNumberValue01) {
return true;
}
bool Actor::process_4103B0(Common::Point *point, ActorDirection dir) {
bool Actor::canMoveCheckActors(Common::Point *point, ActorDirection dir) {
int32 dist = getDistanceForFrame(dir, (_frameIndex >= _frameCount) ? 2 * _frameCount - (_frameIndex + 1) : _frameIndex);
int32 x = point->x + deltaPointsArray[dir].x * dist - _field_948 - 10;
@ -1978,7 +1978,7 @@ void Actor::updateStatus12_Chapter2() {
absX = absY;
if (absX >= 50) {
playSounds(_direction, distance);
move(_direction, distance);
} else {
_frameIndex = 0;
@ -2481,7 +2481,7 @@ void Actor::updateCoordinates(Common::Point vec1, Common::Point vec2) {
ActorDirection dir = (diffY > 0) ? kDirectionS : kDirectionN;
if (process_408B20(&vec2, dir, diffY + 3, false))
if (canMove(&vec2, dir, diffY + 3, false))
updateCoordinatesForDirection(dir, diffY - 1, &_point);
}

6
engines/asylum/resources/actor.h
View file

@ -258,12 +258,12 @@ public:
void processStatus(int32 actorX, int32 actorY, bool doSpeech);
void process_401830(int32 field980, int32 actionAreaId, int32 field978, int field98C, int32 field990, int32 field974, int32 field984, int32 field988);
bool process_4069B0(int32 *x, int32 *y);
bool process_408B20(Common::Point *point, ActorDirection direction, uint32 count, bool hasDelta);
void playSounds(ActorDirection dir, uint32 distance);
bool canMove(Common::Point *point, ActorDirection direction, uint32 count, bool hasDelta);
void move(ActorDirection dir, uint32 distance);
void process_41BC00(int32 reactionIndex, int32 numberValue01Add);
void process_41BCC0(int32 reactionIndex, int32 numberValue01Substract);
bool process_41BDB0(int32 reactionIndex, int32 testNumberValue01);
bool process_4103B0(Common::Point *point, ActorDirection direction);
bool canMoveCheckActors(Common::Point *point, ActorDirection direction);
void updateAndDraw();
void update_409230();

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

@ -930,7 +930,7 @@ IMPLEMENT_OPCODE(_unk2C_ActorSub)
if (cmd->param1 == 2) {
Common::Point point(playerPoint);
if (player->process_408B20(&point, newDirection, 3, false)) {
if (player->canMove(&point, newDirection, 3, false)) {
point.x += (int16)(3 * deltaPointsArray[newDirection].x);
point.y += (int16)(3 * deltaPointsArray[newDirection].y);
@ -939,7 +939,7 @@ IMPLEMENT_OPCODE(_unk2C_ActorSub)
}
}
} else if (cmd->param1 != 2 || player->process_408B20(&playerPoint, newDirection, 3, false)) {
} else if (cmd->param1 != 2 || player->canMove(&playerPoint, newDirection, 3, false)) {
ResourceId id = kResourceNone;
if (direction >= 5)
id = actor->getResourcesId((uint32)(5 * cmd->param1 - (direction - 38)));