[Scummvm-git-logs] scummvm master -> 64cbcba420843aa1bb0888b15592ad08fa17dc59

dreammaster dreammaster at scummvm.org
Mon Jul 24 14:12:49 CEST 2017


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:
64cbcba420 TITANIC: Workaround Conversation area corruption when dragging items


Commit: 64cbcba420843aa1bb0888b15592ad08fa17dc59
    https://github.com/scummvm/scummvm/commit/64cbcba420843aa1bb0888b15592ad08fa17dc59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-24T08:09:00-04:00

Commit Message:
TITANIC: Workaround Conversation area corruption when dragging items

When dragging an item, the bounds for the area of the screen affected
goes from the dragged item to the blinking cursor when the conversation
tab is active. This rect overlapping the conversation area somehow
starts erasing some of the conversation log. Despite some effort, I
haven't been able to track down the exact cause. So the easiest
workaround is simply to make the entire PET as dirty each frame when
dragging an item, which seems to fix the problem. Though it would be
nice, at some point, if the rooot cause could still be identified.

Changed paths:
    engines/titanic/game_manager.cpp


diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index d3d9ced..6079d6f 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -184,6 +184,11 @@ void CGameManager::update() {
 		// Also include any modified area of the PET control
 		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());
 		}





More information about the Scummvm-git-logs mailing list