[Scummvm-cvs-logs] scummvm master -> 47917d5b17e3364f1078425099b6166d4c997f4f
dreammaster
dreammaster at scummvm.org
Sun May 31 02:16:19 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:
47917d5b17 SHERLOCK: Fix restoring info line when talk window closes
Commit: 47917d5b17e3364f1078425099b6166d4c997f4f
https://github.com/scummvm/scummvm/commit/47917d5b17e3364f1078425099b6166d4c997f4f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-05-30T20:14:38-04:00
Commit Message:
SHERLOCK: Fix restoring info line when talk window closes
Changed paths:
engines/sherlock/scalpel/scalpel_user_interface.cpp
engines/sherlock/talk.cpp
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 69ab6ec..295cddb 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1549,6 +1549,8 @@ void ScalpelUserInterface::doTalkControl() {
|| _key == 'E') && _endKeyActive) {
talk.freeTalkVars();
talk.pullSequence();
+
+ drawInterface(2);
banishWindow();
_windowBounds.top = CONTROLS_Y1;
} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released)
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index dd6e776..96e4d0d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -556,6 +556,7 @@ void Talk::talkTo(const Common::String &filename) {
freeTalkVars();
if (!ui._lookScriptFlag) {
+ ui.drawInterface(2);
ui.banishWindow();
ui._windowBounds.top = CONTROLS_Y1;
ui._menuMode = STD_MODE;
More information about the Scummvm-git-logs
mailing list