[Scummvm-git-logs] scummvm master -> 6a7688ad103612781e0378e2d22b700eb50cfed2

[dreammaster]

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:
6a7688ad10 TITANIC: Properly fix disappearing cconversation log text


Commit: 6a7688ad103612781e0378e2d22b700eb50cfed2
    https://github.com/scummvm/scummvm/commit/6a7688ad103612781e0378e2d22b700eb50cfed2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-29T20:30:06-04:00

Commit Message:
TITANIC: Properly fix disappearing cconversation log text

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


diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 6079d6f..13fe1d2 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -185,10 +185,6 @@ void CGameManager::update() {
 		if (_project) {
 			CPetControl *pet = _project->getPetControl();
 
-			// FIXME: Distortion of text in Conversation tab when dragging items
-			if (_dragItem)
-				pet->makeDirty();
-
 			if (pet)
 				_bounds.combine(pet->getBounds());
 		}
diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
index 56f1af4..91a698e 100644
--- a/engines/titanic/support/font.cpp
+++ b/engines/titanic/support/font.cpp
@@ -275,11 +275,11 @@ WriteCharacterResult STFont::writeChar(CVideoSurface *surface, unsigned char c,
 		charRect.left += srcRect->left - destPos.x;
 		destPos.x = srcRect->left;
 	} else {
-		if ((charRect.width() + destPos.x) > srcRect->right) {
+		if ((destPos.x + charRect.width()) > srcRect->right) {
 			if (destPos.x > srcRect->right)
 				return WC_OUTSIDE_RIGHT;
 
-			charRect.right += srcRect->left - destPos.x;
+			charRect.right += srcRect->right - destPos.x - charRect.width();
 		}
 	}