[Scummvm-cvs-logs] scummvm master -> 73242aa5bc15746572c183b24c77e7fb20c023a0

dreammaster dreammaster at scummvm.org
Mon Feb 1 00:11:31 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:
73242aa5bc SHERLOCK: SS: Fix incorrect conversation lines display in German version


Commit: 73242aa5bc15746572c183b24c77e7fb20c023a0
    https://github.com/scummvm/scummvm/commit/73242aa5bc15746572c183b24c77e7fb20c023a0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-01-31T18:10:58-05:00

Commit Message:
SHERLOCK: SS: Fix incorrect conversation lines display in German version

Changed paths:
    engines/sherlock/fonts.cpp
    engines/sherlock/scalpel/scalpel_talk.cpp



diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 9b58eea..431159c 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -130,7 +130,7 @@ void Fonts::setFont(int fontNum) {
 
 	// Iterate through the frames to find the widest and tallest font characters
 	_fontHeight = _widestChar = 0;
-	for (uint idx = 0; idx < _charCount; ++idx) {
+	for (uint idx = 0; idx < MIN((int)_charCount, 128 - 32); ++idx) {
 		_fontHeight = MAX((uint16)_fontHeight, (*_font)[idx]._frame.h);
 		_widestChar = MAX((uint16)_widestChar, (*_font)[idx]._frame.w);
 	}
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index be2baf9..b6e9482 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -276,7 +276,7 @@ void ScalpelTalk::talkInterface(const byte *&str) {
 	str += idx;
 
 	// If line wrap occurred, then move to after the separating space between the words
-	if ((!isOpcode(str[0])) && str[0] != '{')
+	if (str[0] && (!isOpcode(str[0])) && str[0] != '{')
 		++str;
 
 	_yp += 9;






More information about the Scummvm-git-logs mailing list