aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/objectman.cpp
diff options
context:
space:
mode:
authorBendegúz Nagy2016-07-02 23:10:05 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commitce1c52bceb661fafdd828bb89bdd34563a38124f (patch)
tree95ae9f69140398ebe5c8b700e4c0b809c1d37c34 /engines/dm/objectman.cpp
parent883370eb7d0dfdfbc1ef15ed9f0458cdc1423368 (diff)
downloadscummvm-rg350-ce1c52bceb661fafdd828bb89bdd34563a38124f.tar.gz
scummvm-rg350-ce1c52bceb661fafdd828bb89bdd34563a38124f.tar.bz2
scummvm-rg350-ce1c52bceb661fafdd828bb89bdd34563a38124f.zip
DM: Remove blitToScreen overloads
Diffstat (limited to 'engines/dm/objectman.cpp')
-rw-r--r--engines/dm/objectman.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp
index 40dc4f2066..2ce67ace6a 100644
--- a/engines/dm/objectman.cpp
+++ b/engines/dm/objectman.cpp
@@ -224,11 +224,12 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) {
_vm->_displayMan->_g578_useByteBoxCoordinates = false;
if (slotBoxIndex >= k8_SlotBoxInventoryFirstSlot) {
- _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0,
- box, k255_ColorNoTransparency, g296_DungeonViewport);
+ _vm->_displayMan->blitToBitmap(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0,
+ _vm->_displayMan->_g296_bitmapViewport, k112_byteWidthViewport * 2, box, k255_ColorNoTransparency);
+
} else {
- _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0,
- box, k255_ColorNoTransparency, gDefultViewPort);
+ _vm->_displayMan->blitToBitmap(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0,
+ _vm->_displayMan->_g348_bitmapScreen, k160_byteWidthScreen * 2, box, k255_ColorNoTransparency);
}
}
@@ -246,7 +247,8 @@ void ObjectMan::drawLeaderObjectName(Thing thing) {
} else {
objName = _g352_objectNames[iconIndex];
}
- _vm->_textMan->printWithTrailingSpacesToScreen(233, 37, k4_ColorCyan, k0_ColorBlack, objName, k14_ObjectNameMaximumLength);
+ _vm->_textMan->printWithTrailingSpaces(_vm->_displayMan->_g348_bitmapScreen, k160_byteWidthScreen * 2, 233, 37,
+ k4_ColorCyan, k0_ColorBlack, objName, k14_ObjectNameMaximumLength, k200_heightScreen);
}
IconIndice ObjectMan::getIconIndexInSlotBox(uint16 slotBoxIndex) {