diff options
| author | Paul Gilbert | 2015-03-27 23:10:36 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-03-27 23:10:36 -0400 |
| commit | c047009ee10d8de67ee17088aad4ca131d907a8a (patch) | |
| tree | 638f6d4c20ee4277bf03cdc58dca34845855b245 | |
| parent | 5b1ad857b7cd0b6065c01e000dfadb80526a1729 (diff) | |
| download | scummvm-rg350-c047009ee10d8de67ee17088aad4ca131d907a8a.tar.gz scummvm-rg350-c047009ee10d8de67ee17088aad4ca131d907a8a.tar.bz2 scummvm-rg350-c047009ee10d8de67ee17088aad4ca131d907a8a.zip | |
SHERLOCK: Fix hotspots working again after examining an object
| -rw-r--r-- | engines/sherlock/user_interface.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp index 61d6c6a76e..54c1f8e0fc 100644 --- a/engines/sherlock/user_interface.cpp +++ b/engines/sherlock/user_interface.cpp @@ -580,7 +580,8 @@ void UserInterface::doLookControl() { _menuMode = STD_MODE; events.clearEvents(); } - } else { + } + else { // Looking at an inventory object // Backup the user interface Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); @@ -592,15 +593,15 @@ void UserInterface::doLookControl() { // Restore the ui screen._backBuffer2.blitFrom(tempSurface, Common::Point(0, CONTROLS_Y1)); - } - _windowBounds.top = CONTROLS_Y1; - _key = _oldKey = COMMANDS[LOOK_MODE - 1]; - _temp = _oldTemp = 0; - events.clearEvents(); - _invLookFlag = false; - _menuMode = INV_MODE; - _windowOpen = true; + _windowBounds.top = CONTROLS_Y1; + _key = _oldKey = COMMANDS[LOOK_MODE - 1]; + _temp = _oldTemp = 0; + events.clearEvents(); + _invLookFlag = false; + _menuMode = INV_MODE; + _windowOpen = true; + } } } @@ -900,7 +901,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) { } else { makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10), (SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, - PRESS_KEY_FOR_MORE); + PRESS_KEY_TO_CONTINUE); screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, CONTROLS_Y), COMMAND_FOREGROUND, "P"); |