aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-11 23:26:58 -0400
committerPaul Gilbert2015-06-11 23:26:58 -0400
commiteb7fb219464505779ac2ca562291f92788b13c30 (patch)
tree49111394528682f856a8f4cb9037156238055adf /engines/sherlock/objects.cpp
parenta97715f9dcca2022a8f502ded4e4843f076b4687 (diff)
downloadscummvm-rg350-eb7fb219464505779ac2ca562291f92788b13c30.tar.gz
scummvm-rg350-eb7fb219464505779ac2ca562291f92788b13c30.tar.bz2
scummvm-rg350-eb7fb219464505779ac2ca562291f92788b13c30.zip
SHERLOCK: Refactor setWalking into Person classes
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 120fb997da..19561f6eb7 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -321,7 +321,7 @@ void Sprite::checkSprite() {
break;
case WALK_AROUND:
- if (objBounds.contains(people._walkTo.front())) {
+ if (objBounds.contains(people[PLAYER]._walkTo.front())) {
// Reached zone
gotoStand();
} else {
@@ -369,8 +369,8 @@ void Sprite::checkSprite() {
walkPos.x += people[PLAYER]._imageFrame->_frame.w / 2;
people._walkDest = walkPos;
- people._walkTo.push(walkPos);
- people.setWalking();
+ people[PLAYER]._walkTo.push(walkPos);
+ people[PLAYER].setWalking();
}
break;
@@ -1433,7 +1433,7 @@ int Object::pickUpObject(const char *const messages[]) {
} else {
// Play generic pickup sequence
// Original moved cursor position here
- people.goAllTheWay();
+ people[PLAYER].goAllTheWay();
ui._menuCounter = 25;
ui._temp1 = 1;
}