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

dreammaster dreammaster at scummvm.org
Sat Feb 13 02:56:18 CET 2016


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:
c1c16fe288 SHERLOCK: RT: Fix conversation crash German Lawton's house


Commit: c1c16fe28837dd2e5dc63776c1c64f9e181e3df3
    https://github.com/scummvm/scummvm/commit/c1c16fe28837dd2e5dc63776c1c64f9e181e3df3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-02-12T20:54:30-05:00

Commit Message:
SHERLOCK: RT: Fix conversation crash German Lawton's house

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



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 0af8def..b83a977 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -1354,6 +1354,7 @@ void TattooPeople::setTalkSequence(int speaker, int sequenceNum) {
 
 
 int TattooPeople::findSpeaker(int speaker) {
+	speaker &= 0x7f;
 	int result = People::findSpeaker(speaker);
 	const char *portrait = _characters[speaker]._portrait;
 
diff --git a/engines/sherlock/tattoo/widget_text.cpp b/engines/sherlock/tattoo/widget_text.cpp
index 86aa067..d8d229d 100644
--- a/engines/sherlock/tattoo/widget_text.cpp
+++ b/engines/sherlock/tattoo/widget_text.cpp
@@ -80,6 +80,7 @@ void WidgetText::centerWindowOnSpeaker(int speaker) {
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	Common::Point pt;
 
+	speaker &= 0x7f;
 	bool flag = _vm->readFlags(FLAG_PLAYER_IS_HOLMES);
 	if (people[HOLMES]._type == CHARACTER && ((speaker == HOLMES && flag) || (speaker == WATSON && !flag))) {
 		// Place the window centered above the player






More information about the Scummvm-git-logs mailing list