[Scummvm-cvs-logs] scummvm master -> df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
df80a92e0a SHERLOCK: RT: Fix freeing character _altImages when done with


Commit: df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea
    https://github.com/scummvm/scummvm/commit/df80a92e0abb7ec1fc4d6fd8b304ea2ae65f3aea
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-15T10:43:40-04:00

Commit Message:
SHERLOCK: RT: Fix freeing character _altImages when done with

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp
    engines/sherlock/tattoo/tattoo_talk.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index c5f21e2..9274d0a 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 731e3a0..9d5a3db 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;