diff options
| author | Bendegúz Nagy | 2016-07-02 00:27:05 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | e2300bd04c5aebe5736a5d0a431a9b85f53a9d17 (patch) | |
| tree | 5e309b46235e7e215f45bab501265bf45991d442 /engines/dm/objectman.cpp | |
| parent | 5f25c6aae28a3553183ee3c2e8af7b66e9622bf6 (diff) | |
| download | scummvm-rg350-e2300bd04c5aebe5736a5d0a431a9b85f53a9d17.tar.gz scummvm-rg350-e2300bd04c5aebe5736a5d0a431a9b85f53a9d17.tar.bz2 scummvm-rg350-e2300bd04c5aebe5736a5d0a431a9b85f53a9d17.zip | |
DM: Massive renaming in gfx.h
Diffstat (limited to 'engines/dm/objectman.cpp')
| -rw-r--r-- | engines/dm/objectman.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index 458f3fd2b3..ddb002d446 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -192,10 +192,10 @@ void ObjectMan::extractIconFromBitmap(uint16 iconIndex, byte *destBitmap) { } --i; - byte *srcBitmap = _vm->_displayMan->getBitmap(kObjectIcons_000_TO_031 + i); + byte *srcBitmap = _vm->_displayMan->getBitmap(k42_ObjectIcons_000_TO_031 + i); iconIndex -= gIconGraphicFirstIndex[i]; - _vm->_displayMan->_useByteBoxCoordinates = true; - _vm->_displayMan->blitToBitmap(srcBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, destBitmap, 16, 0, 16, 0, 16, kColorNoTransparency); + _vm->_displayMan->_g578_useByteBoxCoordinates = true; + _vm->_displayMan->blitToBitmap(srcBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, destBitmap, 16, 0, 16, 0, 16, k255_ColorNoTransparency); } void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { @@ -218,16 +218,16 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { } } iconGraphicIndex--; - byte *iconsBitmap = _vm->_displayMan->getBitmap(iconGraphicIndex + kObjectIcons_000_TO_031); + byte *iconsBitmap = _vm->_displayMan->getBitmap(iconGraphicIndex + k42_ObjectIcons_000_TO_031); iconIndex -= gIconGraphicFirstIndex[iconGraphicIndex]; - _vm->_displayMan->_useByteBoxCoordinates = false; + _vm->_displayMan->_g578_useByteBoxCoordinates = false; if (slotBoxIndex >= kSlotBoxInventoryFirstSlot) { _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, - box, kColorNoTransparency, gDungeonViewport); + box, k255_ColorNoTransparency, gDungeonViewport); } else { _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, - box, kColorNoTransparency, gDefultViewPort); + box, k255_ColorNoTransparency, gDefultViewPort); } } @@ -245,7 +245,7 @@ void ObjectMan::drawLeaderObjectName(Thing thing) { } else { objName = _objectNames[iconIndex]; } - _vm->_textMan->printWithTrailingSpacesToScreen(233, 37, kColorCyan, kColorBlack, objName, kObjectNameMaximumLength); + _vm->_textMan->printWithTrailingSpacesToScreen(233, 37, k4_ColorCyan, k0_ColorBlack, objName, kObjectNameMaximumLength); } IconIndice ObjectMan::getIconIndexInSlotBox(uint16 slotBoxIndex) { |