From 6a7688ad103612781e0378e2d22b700eb50cfed2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Jul 2017 20:30:06 -0400
Subject: TITANIC: Properly fix disappearing cconversation log text

---
 engines/titanic/game_manager.cpp | 4 ----
 engines/titanic/support/font.cpp | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 6079d6fef0..13fe1d2872 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 56f1af4718..91a698e299 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();
 		}
 	}
 
-- 
cgit v1.2.3