diff options
| author | Paul Gilbert | 2014-04-09 09:32:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-09 09:32:14 -0400 |
| commit | 8df08335462db8fc692f18c9dc5bb4293019d2f6 (patch) | |
| tree | b69e840424bb7e5ea664c3f3ab6c2554dfb67d8b /engines/mads/screen.cpp | |
| parent | 2368ab78865f251184908d523edeab34514e08ed (diff) | |
| download | scummvm-rg350-8df08335462db8fc692f18c9dc5bb4293019d2f6.tar.gz scummvm-rg350-8df08335462db8fc692f18c9dc5bb4293019d2f6.tar.bz2 scummvm-rg350-8df08335462db8fc692f18c9dc5bb4293019d2f6.zip | |
MADS: Fixes for correctly displaying inventory list in the user interface
Diffstat (limited to 'engines/mads/screen.cpp')
| -rw-r--r-- | engines/mads/screen.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 5553f61a11..519dcabccd 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -131,11 +131,13 @@ void DirtyArea::setUISlot(const UISlot *slot) { _bounds.top = 0; setArea(intSurface.w, intSurface.h, intSurface.w, intSurface.h); break; + case IMG_OVERPRINT: _bounds.left = slot->_position.x; _bounds.top = slot->_position.y; - // TODO: spritesIndex & frameNumber used as w & h??! - error("TODO: Figure out IMG_OVERPRINT. Maybe need a union?"); + _bounds.setWidth(slot->_width); + _bounds.setHeight(slot->_height); + setArea(slot->_width, slot->_height, intSurface.w, intSurface.h); break; default: { @@ -491,7 +493,7 @@ void ScreenObjects::elementHighlighted() { indexEnd = invList.size() - 1; varA = 0; topIndex = userInterface._inventoryTopIndex; - idxP = &userInterface._highlightedItemIndex; + idxP = &userInterface._highlightedInvIndex; var4 = (!_released || (_vm->_events->_mouseButtons && action._interAwaiting == 1)) ? 0 : 1; break; @@ -507,7 +509,7 @@ void ScreenObjects::elementHighlighted() { varA = 0; topIndex = 0; - idxP = _vm->_events->_rightMousePressed ? &userInterface._selectedItemVocabIdx : &userInterface._highlightedActionIndex; + idxP = _vm->_events->_rightMousePressed ? &userInterface._selectedItemVocabIdx : &userInterface._highlightedItemVocabIndex; if (_vm->_events->_rightMousePressed && userInterface._selectedActionIndex >= 0) userInterface.updateSelection(CAT_COMMAND, -1, &userInterface._selectedActionIndex); |