diff options
| author | Paul Gilbert | 2017-07-29 20:30:06 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-07-29 20:30:06 -0400 |
| commit | 6a7688ad103612781e0378e2d22b700eb50cfed2 (patch) | |
| tree | bb1f48d781f2d5562bb04a0c58cc5315ce74ab9d /engines | |
| parent | 121b07069c275ed493a46b6ae84c0d0035082b01 (diff) | |
| download | scummvm-rg350-6a7688ad103612781e0378e2d22b700eb50cfed2.tar.gz scummvm-rg350-6a7688ad103612781e0378e2d22b700eb50cfed2.tar.bz2 scummvm-rg350-6a7688ad103612781e0378e2d22b700eb50cfed2.zip | |
TITANIC: Properly fix disappearing cconversation log text
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/game_manager.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/support/font.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
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(); } } |