[Scummvm-cvs-logs] scummvm master -> 7a4d4ac29d27cc52728cabf22ac0c968a4570dfc
dreammaster
dreammaster at scummvm.org
Fri Jul 31 02:49:17 CEST 2015
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:
7a4d4ac29d SHERLOCK: RT: Fix flickering tooltips in scenes with a mask
Commit: 7a4d4ac29d27cc52728cabf22ac0c968a4570dfc
https://github.com/scummvm/scummvm/commit/7a4d4ac29d27cc52728cabf22ac0c968a4570dfc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-30T20:48:20-04:00
Commit Message:
SHERLOCK: RT: Fix flickering tooltips in scenes with a mask
Changed paths:
engines/sherlock/tattoo/tattoo_scene.cpp
engines/sherlock/tattoo/tattoo_user_interface.cpp
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 1ecc997..f851a0a 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -368,9 +368,6 @@ void TattooScene::doBgAnim() {
if (ui._creditsWidget.active())
ui._creditsWidget.blitCredits();
- if (!vm._fastMode)
- events.wait(3);
-
if (screen._flushScreen) {
screen.slamArea(screen._currentScroll.x, screen._currentScroll.y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
screen._flushScreen = false;
@@ -380,6 +377,13 @@ void TattooScene::doBgAnim() {
_doBgAnimDone = true;
ui._drawMenu = false;
+ // Handle drawing the text tooltip if necessary
+ if (ui._menuMode == STD_MODE || ui._menuMode == LAB_MODE)
+ ui._tooltipWidget.draw();
+
+ if (!vm._fastMode)
+ events.wait(3);
+
for (int idx = 1; idx < MAX_CHARACTERS; ++idx) {
if (people[idx]._updateNPCPath)
people[idx].updateNPC();
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index e8756a7..b5ac998 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -321,13 +321,6 @@ void TattooUserInterface::drawInterface(int bufferNum) {
// Bring the widgets to the screen
if (_mask != nullptr)
screen._flushScreen = true;
-
- if (screen._flushScreen)
- screen.blockMove();
-
- // Handle drawing the text tooltip if necessary
- if (_menuMode == STD_MODE || _menuMode == LAB_MODE)
- _tooltipWidget.draw();
}
void TattooUserInterface::doBgAnimRestoreUI() {
More information about the Scummvm-git-logs
mailing list