diff options
| author | johndoe123 | 2013-04-18 19:08:22 +0200 |
|---|---|---|
| committer | johndoe123 | 2013-04-18 19:08:22 +0200 |
| commit | 176a3babc553d1d6eb2a57fddb0a9665fc4aaa71 (patch) | |
| tree | 239f044793de424c8ca50e739beab44b122609c6 /engines/parallaction/input.cpp | |
| parent | e935f85366ba1e83fdd1cea3712959edee1f6270 (diff) | |
| parent | 6c55213cd5a63ff198a25573ad38672e7faa02ce (diff) | |
| download | scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.gz scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.bz2 scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into sword25-gfx
Diffstat (limited to 'engines/parallaction/input.cpp')
| -rw-r--r-- | engines/parallaction/input.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index 4fbd9b99cc..484e210893 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -551,8 +551,12 @@ void Input::setInventoryCursor(ItemName name) { case GType_BRA: { byte *src = _mouseArrow->getData(0); byte *dst = _comboArrow->getData(0); - memcpy(dst, src, _comboArrow->getSize(0)); // FIXME: destination offseting is not clear + Common::Rect srcRect, dstRect; + _mouseArrow->getRect(0, srcRect); + _comboArrow->getRect(0, dstRect); + for (uint y = 0; y < (uint)srcRect.height(); y++) + memcpy(dst + y * dstRect.width(), src + y * srcRect.width(), srcRect.width()); _vm->_inventoryRenderer->drawItem(name, dst + _mouseComboProps_BR._yOffset * _mouseComboProps_BR._width + _mouseComboProps_BR._xOffset, _mouseComboProps_BR._width); CursorMan.replaceCursor(dst, _mouseComboProps_BR._width, _mouseComboProps_BR._height, 0, 0, 0); break; |