diff options
author | Paul Gilbert | 2015-07-24 19:42:41 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-07-24 19:42:41 -0400 |
commit | c6e18844038e087f373923731265beac58485a31 (patch) | |
tree | 72507862f9074d63c6b9fa556522197e38d667e5 /engines/sherlock/tattoo/tattoo_user_interface.cpp | |
parent | 8be83948b1485bb143dd05f7373ffeeb08a8638d (diff) | |
download | scummvm-rg350-c6e18844038e087f373923731265beac58485a31.tar.gz scummvm-rg350-c6e18844038e087f373923731265beac58485a31.tar.bz2 scummvm-rg350-c6e18844038e087f373923731265beac58485a31.zip |
SHERLOCK: RT: Rendering fixes for Options & Quit dialogs
Diffstat (limited to 'engines/sherlock/tattoo/tattoo_user_interface.cpp')
-rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index ef9e895870..f602259ea8 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -31,7 +31,7 @@ namespace Tattoo { TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm), _inventoryWidget(vm), _messageWidget(vm), _textWidget(vm), _tooltipWidget(vm), _verbsWidget(vm), - _labWidget(vm), _creditsWidget(vm), _optionsWidget(vm) { + _labWidget(vm), _creditsWidget(vm), _optionsWidget(vm), _quitWidget(vm) { Common::fill(&_lookupTable[0], &_lookupTable[PALETTE_COUNT], 0); Common::fill(&_lookupTable1[0], &_lookupTable1[PALETTE_COUNT], 0); _scrollSize = 0; @@ -404,12 +404,14 @@ void TattooUserInterface::doStandardControl() { case Common::KEYCODE_F4: // Display options - _optionsWidget.summonWindow(); + events.warpMouse(); + _optionsWidget.load(); return; case Common::KEYCODE_F10: // Quit menu freeMenu(); + events.warpMouse(); doQuitMenu(); return; @@ -559,7 +561,6 @@ void TattooUserInterface::doInventory(int mode) { } void TattooUserInterface::doControls() { - _menuMode = OPTION_MODE; _optionsWidget.load(); } @@ -568,7 +569,7 @@ void TattooUserInterface::pickUpObject(int objNum) { } void TattooUserInterface::doQuitMenu() { - // TODO + _quitWidget.show(); } void TattooUserInterface::putMessage(const char *formatStr, ...) { @@ -818,7 +819,7 @@ void TattooUserInterface::makeBGArea(const Common::Rect &r) { Screen &screen = *_vm->_screen; for (int yp = r.top; yp < r.bottom; ++yp) { - byte *ptr = screen._backBuffer1.getBasePtr(r.left + screen._currentScroll.x, yp); + byte *ptr = screen._backBuffer1.getBasePtr(r.left, yp); for (int xp = r.left; xp < r.right; ++xp, ++ptr) *ptr = _lookupTable[*ptr]; |