[Scummvm-git-logs] scummvm master -> 28537800c486ceccb60628c7d3e1c5f3263ffdf7

dreammaster dreammaster at scummvm.org
Sun Nov 6 00:55:39 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:
28537800c4 TITANIC: Fix line wrapping in conversation log


Commit: 28537800c486ceccb60628c7d3e1c5f3263ffdf7
    https://github.com/scummvm/scummvm/commit/28537800c486ceccb60628c7d3e1c5f3263ffdf7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-05T19:55:31-04:00

Commit Message:
TITANIC: Fix line wrapping in conversation log

Changed paths:
    engines/titanic/support/font.cpp



diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
index b91a7ec..2e98639 100644
--- a/engines/titanic/support/font.cpp
+++ b/engines/titanic/support/font.cpp
@@ -152,7 +152,7 @@ int STFont::writeString(CVideoSurface *surface, const Rect &rect1, const Rect &d
 			setColor(r, g, b);
 		} else {
 			if (*srcP == ' ') {
-				// Check fo rline wrapping
+				// Check for line wrapping
 				checkLineWrap(textSize, rect1.width(), srcP);
 				if (!*srcP)
 					return endP - str.c_str();
@@ -315,7 +315,7 @@ void STFont::extendBounds(Point &textSize, byte c, int maxWidth) const {
 void STFont::checkLineWrap(Point &textSize, int maxWidth, const char *&str) const {
 	bool flag = false;
 	int totalWidth = 0;
-	for (const char *srcPtr = str; *srcPtr && *srcPtr != ' '; ++srcPtr) {
+	for (const char *srcPtr = str + 1; *srcPtr && *srcPtr != ' '; ++srcPtr) {
 		if (*srcPtr == ' ' && flag)
 			break;
 





More information about the Scummvm-git-logs mailing list