diff options
| author | Bendegúz Nagy | 2016-06-23 03:16:36 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 94bd6db7a61af0d5552f86eac06c785a027041bc (patch) | |
| tree | cd7bf5d525ac34189a68fe631f43074d04c004ea /engines/dm/objectman.cpp | |
| parent | 2f6e8a8e64ac2e5bc641532f0dd2ff10915cc469 (diff) | |
| download | scummvm-rg350-94bd6db7a61af0d5552f86eac06c785a027041bc.tar.gz scummvm-rg350-94bd6db7a61af0d5552f86eac06c785a027041bc.tar.bz2 scummvm-rg350-94bd6db7a61af0d5552f86eac06c785a027041bc.zip | |
DM: Add F0291_CHAMPION_DrawSlot, G0425_aT_ChestSlots and constructor to Viewport, swap some warnings for code
Diffstat (limited to 'engines/dm/objectman.cpp')
| -rw-r--r-- | engines/dm/objectman.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index 87d6992907..96f95798f7 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -149,8 +149,8 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { Box box; box._x1 = slotBox->_x; box._y1 = slotBox->_y; - box._x2 = box._x1 + 15; // no need to add +1, comes from a global array - box._y2 = box._y1 + 15; // no need to add +1, comes from a global array + box._x2 = box._x1 + 15 + 1; + box._y2 = box._y1 + 15 + 1; uint16 iconGraphicIndex; for (iconGraphicIndex = 0; iconGraphicIndex < 7; ++iconGraphicIndex) { @@ -164,9 +164,11 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { _vm->_displayMan->_useByteBoxCoordinates = false; if (slotBoxIndex >= kSlotBoxInventoryFirstSlot) { - _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, box, kColorNoTransparency, gDungeonViewport); + _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, + box, kColorNoTransparency, gDungeonViewport); } else { - _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, box, kColorNoTransparency, gDefultViewPort); + _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, + box, kColorNoTransparency, gDefultViewPort); } } |