[Scummvm-git-logs] scummvm master -> 59190f735d9f3e96166be2ed6c6af2633c7a4b49

dreammaster dreammaster at scummvm.org
Thu Feb 23 04:37:49 CET 2017


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
da30e1a0f5 TITANIC: Fix writeString character placement
59190f735d TITANIC: Fix setting display bounds for end credit text


Commit: da30e1a0f5c0129694bb356d8fe556ed3c07247f
    https://github.com/scummvm/scummvm/commit/da30e1a0f5c0129694bb356d8fe556ed3c07247f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-22T22:37:27-05:00

Commit Message:
TITANIC: Fix writeString character placement

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


diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
index f81251b..56f1af4 100644
--- a/engines/titanic/support/font.cpp
+++ b/engines/titanic/support/font.cpp
@@ -214,6 +214,7 @@ void STFont::writeString(CVideoSurface *surface, const Point &destPos, Rect &cli
 		// Form a rect of the area of the next character to draw
 		Rect charRect(_chars[c]._offset, textRect.top,
 			_chars[c]._offset + _chars[c]._width, textRect.bottom);
+		int textX = textPt.x;
 
 		if (textPt.x < clipRect.left) {
 			// Character is either partially or entirely left off-screen
@@ -237,6 +238,7 @@ void STFont::writeString(CVideoSurface *surface, const Point &destPos, Rect &cli
 		// At this point, we know we've got to draw at least part of a character,
 		// and have figured out the area of the character to draw
 		copyRect(surface, textPt, charRect);
+		textPt.x = textX + _chars[c]._width;
 	}
 }
 


Commit: 59190f735d9f3e96166be2ed6c6af2633c7a4b49
    https://github.com/scummvm/scummvm/commit/59190f735d9f3e96166be2ed6c6af2633c7a4b49
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-22T22:37:44-05:00

Commit Message:
TITANIC: Fix setting display bounds for end credit text

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


diff --git a/engines/titanic/support/credit_text.cpp b/engines/titanic/support/credit_text.cpp
index dfe2298..e8da605 100644
--- a/engines/titanic/support/credit_text.cpp
+++ b/engines/titanic/support/credit_text.cpp
@@ -40,6 +40,7 @@ void CCreditText::load(CGameObject *obj, CScreenManager *screenManager,
 		const Rect &rect) {
 	_objectP = obj;
 	_screenManagerP = screenManager;
+	_rect = rect;
 
 	setup();
 





More information about the Scummvm-git-logs mailing list