diff options
| author | Paul Gilbert | 2015-06-11 22:02:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-11 22:02:33 -0400 |
| commit | 3d0e2cb5b000bfa9ff731fc6a83ec402bd9f7aad (patch) | |
| tree | f3780949461d600f733e33cea286f425d5f80619 /engines/sherlock/talk.cpp | |
| parent | f812447274fc1de46560e4e611c9d4cb9bf39beb (diff) | |
| download | scummvm-rg350-3d0e2cb5b000bfa9ff731fc6a83ec402bd9f7aad.tar.gz scummvm-rg350-3d0e2cb5b000bfa9ff731fc6a83ec402bd9f7aad.tar.bz2 scummvm-rg350-3d0e2cb5b000bfa9ff731fc6a83ec402bd9f7aad.zip | |
SHERLOCK: Beginning of descendent Person classes
Tattoo has some different Sprite methods, and since Person descends
from Sprite, need to create descendents from it. And this has also
necessitated some refactoring of People class's _data array
Diffstat (limited to 'engines/sherlock/talk.cpp')
| -rw-r--r-- | engines/sherlock/talk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index db4bcd8d2e..a968f9fea6 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -167,13 +167,13 @@ void Talk::talkTo(const Common::String &filename) { // Turn on the Exit option ui._endKeyActive = true; - if (people[AL]._walkCount || people._walkTo.size() > 0) { + if (people[PLAYER]._walkCount || people._walkTo.size() > 0) { // Only interrupt if an action if trying to do an action, and not just // if the player is walking around the scene if (people._allowWalkAbort) abortFlag = true; - people.gotoStand(people._player); + people.gotoStand(people[PLAYER]); } if (_talkToAbort) |