[Scummvm-cvs-logs] scummvm master -> 667209d755e4f6d371d5851ccb18ffb369e50798

dreammaster dreammaster at scummvm.org
Fri Aug 7 22:14:53 CEST 2015


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:
667209d755 SHERLOCK: RT: Fix loading character graphics for the player


Commit: 667209d755e4f6d371d5851ccb18ffb369e50798
    https://github.com/scummvm/scummvm/commit/667209d755e4f6d371d5851ccb18ffb369e50798
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-07T16:14:00-04:00

Commit Message:
SHERLOCK: RT: Fix loading character graphics for the player

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



diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 4fea876..8ea0461 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -403,7 +403,7 @@ OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) {
 }
 
 OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) {
-	int npcNum = *++str;
+	int npcNum = *++str - 1;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
 	person._misc = 0;
@@ -560,7 +560,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseLookingHolmes(const byte *&str) {
 }
 
 OpcodeReturn TattooTalk::cmdSetNPCPosition(const byte *&str) {
-	int npcNum = *++str;
+	int npcNum = *++str - 1;
 	++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
@@ -710,7 +710,7 @@ OpcodeReturn TattooTalk::cmdSetNPCVerbTarget(const byte *&str) {
 }
 
 OpcodeReturn TattooTalk::cmdSetNPCWalkGraphics(const byte *&str) {
-	int npcNum = *++str;
+	int npcNum = *++str - 1;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	Person &person = people[npcNum];
 






More information about the Scummvm-git-logs mailing list