diff options
| author | Paul Gilbert | 2014-03-23 09:19:28 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-03-23 09:19:28 -0400 |
| commit | 0d158075019940ccf25b4e5b9bd4676e9a06f87d (patch) | |
| tree | f6401d511b1f2633c7901c4603a492665dd6a862 /engines/mads/screen.cpp | |
| parent | 6fed5933a84421f413daeb0983281381acc7c128 (diff) | |
| download | scummvm-rg350-0d158075019940ccf25b4e5b9bd4676e9a06f87d.tar.gz scummvm-rg350-0d158075019940ccf25b4e5b9bd4676e9a06f87d.tar.bz2 scummvm-rg350-0d158075019940ccf25b4e5b9bd4676e9a06f87d.zip | |
MADS: Fixes for animating inventory item
Diffstat (limited to 'engines/mads/screen.cpp')
| -rw-r--r-- | engines/mads/screen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 22896e011b..964e83630c 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -120,8 +120,8 @@ void DirtyArea::setUISlot(const UISlot *slot) { int type = slot->_slotType; if (type <= -20) type += 20; - if (type >= 64) - type &= 0xBF; + if (type >= 0x40) + type &= ~0x40; MSurface &intSurface = _vm->_game->_scene._userInterface; switch (type) { @@ -148,7 +148,7 @@ void DirtyArea::setUISlot(const UISlot *slot) { _bounds.top = slot->_position.y; } else { _bounds.left = slot->_position.x + w / 2; - _bounds.top = slot->_position.y + h / 2; + _bounds.top = slot->_position.y - h + 1; } setArea(w, h, intSurface.w, intSurface.h); @@ -182,7 +182,7 @@ void DirtyAreas::merge(int startIndex, int count) { continue; if ((*this)[outerCtr]._textActive && (*this)[innerCtr]._textActive) - mergeAreas(outerCtr, innerCtr); + mergeAreas(innerCtr, outerCtr); } } } |