diff options
| author | Paul Gilbert | 2015-08-15 10:43:40 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-15 10:43:40 -0400 |
| commit | df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea (patch) | |
| tree | ade4b2c3e9e991997dbd2157d46f588defa7339e | |
| parent | 68499c79c4831d6f4f3f61a9bf117a891a50cd4f (diff) | |
| download | scummvm-rg350-df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea.tar.gz scummvm-rg350-df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea.tar.bz2 scummvm-rg350-df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea.zip | |
SHERLOCK: RT: Fix freeing character _altImages when done with
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index c5f21e2a30..9274d0a3c3 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -921,7 +921,7 @@ void TattooPerson::checkWalkGraphics() { // See if we're already using Alternate Graphics if (_altSeq) { // See if the VGS file called for is different than the alternate graphics already loaded - if (!_walkSequences[_sequenceNumber]._vgsName.compareToIgnoreCase(_walkSequences[_altSeq - 1]._vgsName)) { + if (_walkSequences[_sequenceNumber]._vgsName.compareToIgnoreCase(_walkSequences[_altSeq - 1]._vgsName)) { // Different AltGraphics, Free the old ones freeAltGraphics(); } diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index 731e3a0e56..9d5a3dbc93 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -579,7 +579,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPosition(const byte *&str) { posX = -1 * (posX - 16384); int posY = (str[2] - 1) * 256 + str[3] - 1; - people[npcNum]._position = Point32(posX * FIXED_INT_MULTIPLIER, posY * FIXED_INT_MULTIPLIER); + person._position = Point32(posX * FIXED_INT_MULTIPLIER, posY * FIXED_INT_MULTIPLIER); if (person._seqTo && person._walkLoaded) { person._walkSequences[person._sequenceNumber]._sequences[person._frameNumber] = person._seqTo; person._seqTo = 0; |