[Scummvm-cvs-logs] scummvm master -> 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73

dreammaster dreammaster at scummvm.org
Wed Jul 22 04:46:10 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:
4e5c8d35f7 SHERLOCK: RT: Further fixes for credits display


Commit: 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73
    https://github.com/scummvm/scummvm/commit/4e5c8d35f7e133e2e72a846fdbd54900c91eeb73
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-21T22:44:34-04:00

Commit Message:
SHERLOCK: RT: Further fixes for credits display

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



diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 2e78fd5..90d2e5d 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -260,7 +260,7 @@ void TattooEngine::drawCredits() {
 
 	for (uint idx = 0; idx < _creditLines.size() && _creditLines[idx]._position.y < _screen->h(); ++idx) {
 		if (screenRect.contains(_creditLines[idx]._position)) {
-			if (_creditLines[idx]._position.x >= 65536) {
+			if (!_creditLines[idx]._line2.empty()) {
 				int x1 = _creditLines[idx]._position.x;
 				int x2 = x1 + _creditLines[idx]._xOffset;
 				const Common::String &line1 = _creditLines[idx]._line;
@@ -394,7 +394,7 @@ void TattooEngine::doHangManPuzzle() {
 		lines[line].x += paperBounds.left;
 		lines[line].y += paperBounds.top;
 
-		for (i = 0; i <= numWide; ++i)
+		for (i = 0; i <= (size_t)numWide; ++i)
 			answers[line][i] = 0;
 	}
 






More information about the Scummvm-git-logs mailing list