diff options
author | Paul Gilbert | 2015-06-12 23:23:16 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-12 23:23:16 -0400 |
commit | 803c06beb919b35d29bb65ec2e7e48caca69c730 (patch) | |
tree | dcce1cc2ed3ff46c7238e3d801a4567b90f71d8c /engines/sherlock/talk.cpp | |
parent | 6221c1de82bae650158b54a4b04f8f319416ac63 (diff) | |
download | scummvm-rg350-803c06beb919b35d29bb65ec2e7e48caca69c730.tar.gz scummvm-rg350-803c06beb919b35d29bb65ec2e7e48caca69c730.tar.bz2 scummvm-rg350-803c06beb919b35d29bb65ec2e7e48caca69c730.zip |
SHERLOCK: RT: Implement startCAnim
Diffstat (limited to 'engines/sherlock/talk.cpp')
-rw-r--r-- | engines/sherlock/talk.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 0e9feedd87..bb8a059d34 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -169,13 +169,13 @@ void Talk::talkTo(const Common::String &filename) { // Turn on the Exit option ui._endKeyActive = true; - if (people[PLAYER]._walkCount || people[PLAYER]._walkTo.size() > 0) { + if (people[HOLMES]._walkCount || people[HOLMES]._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[PLAYER].gotoStand(); + people[HOLMES].gotoStand(); } if (_talkToAbort) @@ -501,7 +501,7 @@ void Talk::talk(int objNum) { events.setCursor(WAIT); if (obj._lookPosition.y != 0) // Need to walk to character first - people[PLAYER].walkToCoords(obj._lookPosition, obj._lookFacing); + people[HOLMES].walkToCoords(obj._lookPosition, obj._lookFacing); events.setCursor(ARROW); if (!_talkToAbort) @@ -516,7 +516,7 @@ void Talk::talk(int objNum) { events.setCursor(WAIT); if (obj._lookPosition.y != 0) // Walk over to person to talk to - people[PLAYER].walkToCoords(obj._lookPosition, obj._lookFacing); + people[HOLMES].walkToCoords(obj._lookPosition, obj._lookFacing); events.setCursor(ARROW); if (!_talkToAbort) { @@ -1318,14 +1318,14 @@ OpcodeReturn Talk::cmdEnableEndKey(const byte *&str) { OpcodeReturn Talk::cmdHolmesOff(const byte *&str) { People &people = *_vm->_people; - people[PLAYER]._type = REMOVE; + people[HOLMES]._type = REMOVE; return RET_SUCCESS; } OpcodeReturn Talk::cmdHolmesOn(const byte *&str) { People &people = *_vm->_people; - people[PLAYER]._type = CHARACTER; + people[HOLMES]._type = CHARACTER; return RET_SUCCESS; } @@ -1452,7 +1452,7 @@ OpcodeReturn Talk::cmdWalkToCAnimation(const byte *&str) { ++str; CAnim &animation = scene._cAnim[str[0] - 1]; - people[PLAYER].walkToCoords(animation._goto[0], animation._goto[0]._facing); + people[HOLMES].walkToCoords(animation._goto[0], animation._goto[0]._facing); return _talkToAbort ? RET_EXIT : RET_SUCCESS; } |