From 4133ea66c13bde70b1383e525b20202ead875722 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 21 Sep 2016 07:53:54 +0200 Subject: DM: Rename GraphicIndice members --- engines/dm/champion.cpp | 36 +++++------ engines/dm/dialog.cpp | 2 +- engines/dm/dm.cpp | 24 +++---- engines/dm/gfx.cpp | 98 ++++++++++++++--------------- engines/dm/gfx.h | 158 +++++++++++++++++++++++------------------------ engines/dm/inventory.cpp | 32 +++++----- engines/dm/menus.cpp | 10 +-- engines/dm/objectman.cpp | 4 +- engines/dm/text.cpp | 2 +- 9 files changed, 183 insertions(+), 183 deletions(-) (limited to 'engines/dm') diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp index 0bd060d145..5b4a4dc9df 100644 --- a/engines/dm/champion.cpp +++ b/engines/dm/champion.cpp @@ -1401,7 +1401,7 @@ void ChampionMan::applyAndDrawPendingDamageAndWounds() { blitBox._rect.bottom = 28; blitBox._rect.left = textPosX + 7; blitBox._rect.right = blitBox._rect.left + 31; /* Box is over the champion portrait in the status box */ - _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(k16_damageToChampionBig), &blitBox, k16_byteWidth, kDMColorFlesh, 29); + _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxDamageToChampionBig), &blitBox, k16_byteWidth, kDMColorFlesh, 29); // Check the number of digits and sets the position accordingly. if (pendingDamage < 10) // 1 digit textPosX += 21; @@ -1415,7 +1415,7 @@ void ChampionMan::applyAndDrawPendingDamageAndWounds() { blitBox._rect.bottom = 6; blitBox._rect.left = textPosX; blitBox._rect.right = blitBox._rect.left + 47; /* Box is over the champion name in the status box */ - _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(k15_damageToChampionSmallIndice), &blitBox, k24_byteWidth, kDMColorFlesh, 7); + _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxDamageToChampionSmall), &blitBox, k24_byteWidth, kDMColorFlesh, 7); // Check the number of digits and sets the position accordingly. if (pendingDamage < 10) // 1 digit textPosX += 19; @@ -1875,7 +1875,7 @@ void ChampionMan::addCandidateChampionToParty(uint16 championPortraitIndex) { championPtr->resetToZero(); // Strangerke - TODO: Check if the new code is possible to run on the older version (example: the portraits could be missing in the data) _vm->_displayMan->_useByteBoxCoordinates = true; - _vm->_displayMan->blitToBitmap(_vm->_displayMan->getNativeBitmapOrGraphic(k26_ChampionPortraitsIndice), championPtr->_portrait, _boxChampionPortrait, getChampionPortraitX(championPortraitIndex), getChampionPortraitY(championPortraitIndex), k128_byteWidth, k16_byteWidth, kDMColorNoTransparency, 87, 29); + _vm->_displayMan->blitToBitmap(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxChampionPortraits), championPtr->_portrait, _boxChampionPortrait, getChampionPortraitX(championPortraitIndex), getChampionPortraitY(championPortraitIndex), k128_byteWidth, k16_byteWidth, kDMColorNoTransparency, 87, 29); championPtr->_actionIndex = kDMActionNone; championPtr->_enableActionEventIndex = -1; championPtr->_hideDamageReceivedIndex = -1; @@ -2139,13 +2139,13 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) { uint16 borderCount = 0; if (_party._fireShieldDefense > 0) - nativeBitmapIndices[borderCount++] = k38_BorderPartyFireshieldIndice; + nativeBitmapIndices[borderCount++] = kDMGraphicIdxBorderPartyFireshield; if (_party._spellShieldDefense > 0) - nativeBitmapIndices[borderCount++] = k39_BorderPartySpellshieldIndice; + nativeBitmapIndices[borderCount++] = kDMGraphicIdxBorderPartySpellshield; if ((_party._shieldDefense > 0) || curChampion->_shieldDefense) - nativeBitmapIndices[borderCount++] = k37_BorderPartyShieldIndice; + nativeBitmapIndices[borderCount++] = kDMGraphicIdxBorderPartyShield; while (borderCount--) _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(nativeBitmapIndices[borderCount]), &box, k40_byteWidth, kDMColorFlesh, 29); @@ -2156,7 +2156,7 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) { } else setFlag(championAttributes, kDMAttributeNameTitle | kDMAttributeStatistics | kDMAttributeWounds | kDMAttributeActionHand); } else { - _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(k8_StatusBoxDeadChampion), &box, k40_byteWidth, kDMColorNoTransparency, 29); + _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxStatusBoxDeadChampion), &box, k40_byteWidth, kDMColorNoTransparency, 29); _vm->_textMan->printToLogicalScreen(championStatusBoxX + 1, 5, kDMColorLightestGray, kDMColorDarkGary, curChampion->_name); _vm->_menuMan->drawActionIcon(champIndex); @@ -2199,15 +2199,15 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) { drawHealthStaminaManaValues(curChampion); int16 nativeBitmapIndex; if ((curChampion->_food < 0) || (curChampion->_water < 0) || (curChampion->_poisonEventCount)) - nativeBitmapIndex = k34_SlotBoxWoundedIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxWounded; else - nativeBitmapIndex = k33_SlotBoxNormalIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxNormal; _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(nativeBitmapIndex), boxMouth, k16_byteWidth, kDMColorDarkestGray, 18); - nativeBitmapIndex = k33_SlotBoxNormalIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxNormal; for (int i = kDMStatStrength; i <= kDMStatAntifire; i++) { if ((curChampion->_statistics[i][kDMStatCurrent] < curChampion->_statistics[i][kDMStatMaximum])) { - nativeBitmapIndex = k34_SlotBoxWoundedIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxWounded; break; } } @@ -2261,7 +2261,7 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) { uint16 championIconIndex = getChampionIconIndex(curChampion->_cell, _vm->_dungeonMan->_partyDir); if (getFlag(championAttributes, kDMAttributeIcon) && (_vm->_eventMan->_useChampionIconOrdinalAsMousePointerBitmap != _vm->indexToOrdinal(championIconIndex))) { _vm->_displayMan->fillScreenBox(_boxChampionIcons[championIconIndex], _championColor[champIndex]); - _vm->_displayMan->blitToBitmap(_vm->_displayMan->getNativeBitmapOrGraphic(k28_ChampionIcons), _vm->_displayMan->_bitmapScreen, _boxChampionIcons[championIconIndex], getChampionIconIndex(curChampion->_dir, _vm->_dungeonMan->_partyDir) * 19, 0, k40_byteWidth, k160_byteWidthScreen, kDMColorDarkestGray, 14, k200_heightScreen); + _vm->_displayMan->blitToBitmap(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxChampionIcons), _vm->_displayMan->_bitmapScreen, _boxChampionIcons[championIconIndex], getChampionIconIndex(curChampion->_dir, _vm->_dungeonMan->_partyDir) * 19, 0, k40_byteWidth, k160_byteWidthScreen, kDMColorDarkestGray, 14, k200_heightScreen); } if (getFlag(championAttributes, kDMAttributePanel) && isInventoryChampion) { if (_vm->_pressingMouth) @@ -2333,9 +2333,9 @@ void ChampionMan::drawSlot(uint16 champIndex, int16 slotIndex) { iconIndex = kDMIconIndiceReadyHand + (slotIndex << 1); if (champ->getWoundsFlag((ChampionWound)(1 << slotIndex))) { iconIndex++; - nativeBitmapIndex = k34_SlotBoxWoundedIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxWounded; } else - nativeBitmapIndex = k33_SlotBoxNormalIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxNormal; } else { if ((slotIndex >= kDMSlotNeck) && (slotIndex <= kDMSlotBackpackLine1_1)) iconIndex = kDMIconIndiceNeck + (slotIndex - kDMSlotNeck); @@ -2349,14 +2349,14 @@ void ChampionMan::drawSlot(uint16 champIndex, int16 slotIndex) { } // BUG2_00 if (slotIndex <= kDMSlotFeet) { if (champ->getWoundsFlag((ChampionWound)(1 << slotIndex))) - nativeBitmapIndex = k34_SlotBoxWoundedIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxWounded; else - nativeBitmapIndex = k33_SlotBoxNormalIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxNormal; } } if ((slotIndex == kDMSlotActionHand) && (_vm->indexToOrdinal(champIndex) == _actingChampionOrdinal)) - nativeBitmapIndex = k35_SlotBoxActingHandIndice; + nativeBitmapIndex = kDMGraphicIdxSlotBoxActingHand; if (nativeBitmapIndex != -1) { _vm->_displayMan->_useByteBoxCoordinates = false; @@ -2391,7 +2391,7 @@ void ChampionMan::renameChampion(Champion *champ) { displayBox._rect.right = displayBox._rect.left + 167; _vm->_displayMan->fillBoxBitmap(_vm->_displayMan->_bitmapViewport, displayBox, kDMColorDarkestGray, k112_byteWidthViewport, k136_heightViewport); - _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k27_PanelRenameChampionIndice), _vm->_inventoryMan->_boxPanel, k72_byteWidth, kDMColorCyan, 73); + _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelRenameChampion), _vm->_inventoryMan->_boxPanel, k72_byteWidth, kDMColorCyan, 73); _vm->_textMan->printToViewport(177, 58, kDMColorLightestGray, "_______"); _vm->_textMan->printToViewport(105, 76, kDMColorLightestGray, "___________________"); _vm->_eventMan->showMouse(); diff --git a/engines/dm/dialog.cpp b/engines/dm/dialog.cpp index 39fbadd8e5..3fbab203d3 100644 --- a/engines/dm/dialog.cpp +++ b/engines/dm/dialog.cpp @@ -43,7 +43,7 @@ void DialogMan::dialogDraw(const char *msg1, const char *msg2, const char *choic static Box dialog2ChoicesPatch = Box(102, 122, 89, 125); static Box dialog4ChoicesPatch = Box(102, 122, 62, 97); - _vm->_displayMan->loadIntoBitmap(k0_dialogBoxGraphicIndice, _vm->_displayMan->_bitmapViewport); + _vm->_displayMan->loadIntoBitmap(kDMGraphicIdxDialogBox, _vm->_displayMan->_bitmapViewport); //Strangerke: the version should be replaced by a ScummVM/RogueVM (?) string // TODO: replace with ScummVM version string _vm->_textMan->printTextToBitmap(_vm->_displayMan->_bitmapViewport, k112_byteWidthViewport, 192, 7, kDMColorLightGray, kDMColorDarkGary, "V2.2", k136_heightViewport); diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index cb2a2f1053..e9b27246ae 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -268,7 +268,7 @@ void DMEngine::initializeGame() { } } while (loadgame(saveSlot) != kDMLoadgameSuccess); - _displayMan->loadIntoBitmap(k11_MenuSpellAreLinesIndice, _menuMan->_bitmapSpellAreaLines); // @ F0396_MENUS_LoadSpellAreaLinesBitmap + _displayMan->loadIntoBitmap(kDMGraphicIdxMenuSpellAreLines, _menuMan->_bitmapSpellAreaLines); // @ F0396_MENUS_LoadSpellAreaLinesBitmap // There was some memory wizardy for the Amiga platform, I skipped that part _displayMan->allocateFlippedWallBitmaps(); @@ -517,9 +517,9 @@ void DMEngine::processEntrance() { _entranceDoorAnimSteps[8] = _entranceDoorAnimSteps[7] + 128 * 161; _entranceDoorAnimSteps[9] = _entranceDoorAnimSteps[8] + 128 * 161 * 2; - _displayMan->loadIntoBitmap(k3_entranceRightDoorGraphicIndice, _entranceDoorAnimSteps[4]); - _displayMan->loadIntoBitmap(k2_entranceLeftDoorGraphicIndice, _entranceDoorAnimSteps[0]); - _interfaceCredits = _displayMan->getNativeBitmapOrGraphic(k5_creditsGraphicIndice); + _displayMan->loadIntoBitmap(kDMGraphicIdxEntranceRightDoor, _entranceDoorAnimSteps[4]); + _displayMan->loadIntoBitmap(kDMGraphicIdxEntranceLeftDoor, _entranceDoorAnimSteps[0]); + _interfaceCredits = _displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxCredits); _displayMan->_useByteBoxCoordinates = false; Box displayBox(0, 100, 0, 160); for (uint16 idx = 1; idx < 4; idx++) { @@ -630,7 +630,7 @@ void DMEngine::endGame(bool doNotDrawCreditsOnly) { for (int16 championIndex = kDMChampionFirst; championIndex < _championMan->_partyChampionCount; championIndex++) { int16 textPosY = championIndex * 48; Champion *curChampion = &_championMan->_champions[championIndex]; - _displayMan->blitToScreen(_displayMan->getNativeBitmapOrGraphic(k208_wallOrn_43_champMirror), &championMirrorBox, k32_byteWidth, kDMColorFlesh, 43); + _displayMan->blitToScreen(_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxWallOrnChampMirror), &championMirrorBox, k32_byteWidth, kDMColorFlesh, 43); _displayMan->blitToScreen(curChampion->_portrait, &championPortraitBox, k16_byteWidth, kDMColorDarkGary, 29); _textMan->printEndGameString(87, textPosY += 14, kDMColorGold, curChampion->_name); int textPosX = (6 * strlen(curChampion->_name)) + 87; @@ -658,7 +658,7 @@ void DMEngine::endGame(bool doNotDrawCreditsOnly) { } T0444017: _displayMan->fillScreen(kDMColorBlack); - _displayMan->blitToScreen(_displayMan->getNativeBitmapOrGraphic(k6_theEndIndice), &theEndBox, k40_byteWidth, kDMColorNoTransparency, 14); + _displayMan->blitToScreen(_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxTheEnd), &theEndBox, k40_byteWidth, kDMColorNoTransparency, 14); for (uint16 i = 0; i < 16; ++i) darkBluePalette[i] = D01_RGB_DARK_BLUE; uint16 curPalette[16]; @@ -716,7 +716,7 @@ T0444017: _displayMan->startEndFadeToPalette(darkBluePalette); } Box box(0, 319, 0, 199); - _displayMan->blitToScreen(_displayMan->getNativeBitmapOrGraphic(k5_creditsGraphicIndice), &box, k160_byteWidthScreen, kDMColorNoTransparency, k200_heightScreen); + _displayMan->blitToScreen(_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxCredits), &box, k160_byteWidthScreen, kDMColorNoTransparency, k200_heightScreen); _displayMan->startEndFadeToPalette(_displayMan->_palCredits); _eventMan->waitForMouseOrKeyActivity(); @@ -764,7 +764,7 @@ void DMEngine::drawEntrance() { _displayMan->startEndFadeToPalette(_displayMan->_blankBuffer); // note, a global variable is used here in the original - _displayMan->loadIntoBitmap(k4_entranceGraphicIndice, _displayMan->_bitmapScreen); + _displayMan->loadIntoBitmap(kDMGraphicIdxEntrance, _displayMan->_bitmapScreen); _displayMan->drawDungeon(kDMDirSouth, 2, 0); if (!_savedScreenForOpenEntranceDoors) @@ -781,10 +781,10 @@ void DMEngine::drawEntrance() { void DMEngine::openEntranceDoors() { Box rightDoorBox(109, 231, 30, 193); - byte *rightDoorBitmap = _displayMan->getNativeBitmapOrGraphic(k3_entranceRightDoorGraphicIndice); + byte *rightDoorBitmap = _displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxEntranceRightDoor); Box leftDoorBox(0, 100, 30, 193); uint16 leftDoorBlitFrom = 0; - byte *leftDoorBitmap = _displayMan->getNativeBitmapOrGraphic(k2_entranceLeftDoorGraphicIndice); + byte *leftDoorBitmap = _displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxEntranceLeftDoor); Box screenBox(0, 319, 0, 199); @@ -823,7 +823,7 @@ void DMEngine::drawTittle() { byte *allocatedMem = new byte[145600 * 2]; byte *titleSteps = allocatedMem; byte *bitmapTitle = titleSteps; - _displayMan->loadIntoBitmap(k1_titleGraphicsIndice, titleSteps); + _displayMan->loadIntoBitmap(kDMGraphicIdxTitle, titleSteps); titleSteps += 320 * 200; uint16 blitPalette[16]; @@ -888,7 +888,7 @@ void DMEngine::drawTittle() { void DMEngine::entranceDrawCredits() { _eventMan->showMouse(); _displayMan->startEndFadeToPalette(_displayMan->_blankBuffer); - _displayMan->loadIntoBitmap(k5_creditsGraphicIndice, _displayMan->_bitmapScreen); + _displayMan->loadIntoBitmap(kDMGraphicIdxCredits, _displayMan->_bitmapScreen); _displayMan->startEndFadeToPalette(_displayMan->_palCredits); delay(50); _eventMan->waitForMouseOrKeyActivity(); diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index c382342094..d8d680c6a9 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -538,14 +538,14 @@ void DisplayMan::initializeGraphicData() { _derivedBitmapByteCount[kDMDerivedBitmapDamageToCreatureSmall] = 24 * 37; for (int16 doorOrnamentIndex = k15_DoorOrnDestroyedMask; doorOrnamentIndex <= k16_DoorOrnThivesEyeMask; doorOrnamentIndex++) { - _currMapDoorOrnInfo[doorOrnamentIndex].nativeIndice = doorOrnamentIndex + (k301_DoorMaskDestroyedIndice - k15_DoorOrnDestroyedMask); + _currMapDoorOrnInfo[doorOrnamentIndex].nativeIndice = doorOrnamentIndex + (kDMGraphicIdxDoorMaskDestroyed - k15_DoorOrnDestroyedMask); _currMapDoorOrnInfo[doorOrnamentIndex].coordinateSet = 1; _derivedBitmapByteCount[doorOrnamentIndex * 2 + kDMDerivedBitmapFirstDoorOrnamentD3] = 24 * 41; _derivedBitmapByteCount[doorOrnamentIndex * 2 + kDMDerivedBitmapFirstDoorOrnamentD2] = 32 * 61; } - _currMapFloorOrnInfo[k15_FloorOrnFootprints].nativeIndice = k241_FloorOrn_15_D3L_footprints; + _currMapFloorOrnInfo[k15_FloorOrnFootprints].nativeIndice = kDMGraphicIdxFloorOrnD3LFootprints; _currMapFloorOrnInfo[k15_FloorOrnFootprints].coordinateSet = 1; ObjectAspect *objectAspect = _objectAspects209; @@ -710,8 +710,8 @@ void DisplayMan::unpackGraphics() { _bitmaps[i] = _bitmaps[i - 1] + getPixelWidth(i - 1) * getPixelHeight(i - 1); loadIntoBitmap(i, _bitmaps[i]); } - _bitmaps[k557_FontGraphicIndice] = _bitmaps[532] + getPixelWidth(532) * getPixelHeight(532); - loadFNT1intoBitmap(k557_FontGraphicIndice, _bitmaps[k557_FontGraphicIndice]); + _bitmaps[kDMGraphicIdxFont] = _bitmaps[532] + getPixelWidth(532) * getPixelHeight(532); + loadFNT1intoBitmap(kDMGraphicIdxFont, _bitmaps[kDMGraphicIdxFont]); } void DisplayMan::loadFNT1intoBitmap(uint16 index, byte *destBitmap) { @@ -768,7 +768,7 @@ void DisplayMan::drawDoorButton(int16 doorButtonOrdinal, DoorButton doorButton) assert(doorButtonOrdinal == 0); - int16 nativeBitmapIndex = doorButtonOrdinal + k315_firstDoorButton_GraphicIndice; + int16 nativeBitmapIndex = doorButtonOrdinal + kDMGraphicIdxFirstDoorButton; int coordSet = doorButtonCoordSet[doorButtonOrdinal]; uint16 *coordSetRedEagle = doorButtonCoordSets[coordSet][doorButton]; @@ -950,11 +950,11 @@ byte *DisplayMan::getExplosionBitmap(uint16 explosionAspIndex, uint16 scale, int byte *bitmap; int16 derBitmapIndex = (explosionAspIndex * 14) + scale / 2 + kDMDerivedBitmapFirstExplosion - 2; if ((scale == 32) && (explosionAspIndex != kDMExplosionAspectSmoke)) - bitmap = getNativeBitmapOrGraphic(explosionAspIndex + k348_FirstExplosionGraphicIndice); + bitmap = getNativeBitmapOrGraphic(explosionAspIndex + kDMGraphicIdxFirstExplosion); else if (isDerivedBitmapInCache(derBitmapIndex)) bitmap = getDerivedBitmap(derBitmapIndex); else { - byte *nativeBitmap = getNativeBitmapOrGraphic(MIN(explosionAspIndex, (uint16)kDMExplosionAspectPoison) + k348_FirstExplosionGraphicIndice); + byte *nativeBitmap = getNativeBitmapOrGraphic(MIN(explosionAspIndex, (uint16)kDMExplosionAspectPoison) + kDMGraphicIdxFirstExplosion); bitmap = getDerivedBitmap(derBitmapIndex); blitToBitmapShrinkWithPalChange(nativeBitmap, bitmap, explAsp->_byteWidth, explAsp->_height, pixelWidth * 2, height, (explosionAspIndex == kDMExplosionAspectSmoke) ? _palChangeSmoke : _palChangesNoChanges); @@ -1306,7 +1306,7 @@ void DisplayMan::drawSquareD3L(Direction dir, int16 posX, int16 posY) { break; case kDMElementTypePit: if (!squareAspect[kDMSquareAspectPitInvisible]) - drawFloorPitOrStairsBitmap(k49_FloorPit_D3L_GraphicIndice, frameFloorPitD3L); + drawFloorPitOrStairsBitmap(kDMGraphicIdxFloorPitD3L, frameFloorPitD3L); // no break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: @@ -1389,7 +1389,7 @@ void DisplayMan::drawSquareD3R(Direction dir, int16 posX, int16 posY) { break;; case kDMElementTypePit: if (!squareAspect[kDMSquareAspectPitInvisible]) - drawFloorPitOrStairsBitmapFlippedHorizontally(k49_FloorPit_D3L_GraphicIndice, frameFloorPitD3R); + drawFloorPitOrStairsBitmapFlippedHorizontally(kDMGraphicIdxFloorPitD3L, frameFloorPitD3R); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: @@ -1467,7 +1467,7 @@ void DisplayMan::drawSquareD3C(Direction dir, int16 posX, int16 posY) { break; case kDMElementTypePit: if (!squareAspect[kDMSquareAspectPitInvisible]) - drawFloorPitOrStairsBitmap(k50_FloorPit_D3C_GraphicIndice, frameFloorPitD3C); + drawFloorPitOrStairsBitmap(kDMGraphicIdxFloorPitD3C, frameFloorPitD3C); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: @@ -1546,7 +1546,7 @@ void DisplayMan::drawSquareD2L(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderDoorPass2FrontLeftFrontRight; break; case kDMElementTypePit: - drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? k57_FloorPir_Invisible_D2L_GraphicIndice : k51_FloorPit_D2L_GraphicIndice, + drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD2L : kDMGraphicIdxFloorPitD2L, frameFloorPitD2L); // No break on purpose case kDMElementTypeTeleporter: @@ -1561,7 +1561,7 @@ void DisplayMan::drawSquareD2L(Direction dir, int16 posX, int16 posY) { } if (!skip) { - drawCeilingPit(k63_ceilingPit_D2L_GraphicIndice, &FrameCeilingPitD2L, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD2L, &FrameCeilingPitD2L, posX, posY, false); drawObjectsCreaturesProjectilesExplosions(Thing(squareAspect[kDMSquareAspectFirstGroupOrObject]), dir, posX, posY, kDMViewSquareD2L, order); } @@ -1605,7 +1605,7 @@ void DisplayMan::drawSquareD2R(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackRightBackLeftFrontRightFrontLeft; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2R); - drawCeilingPit(k63_ceilingPit_D2L_GraphicIndice, &frameCeilingPitD2R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD2L, &frameCeilingPitD2R, posX, posY, true); break; case kDMElementTypeWall: drawWallSetBitmap(_bitmapWallSetD2LCR, _frameWalls163[kDMViewSquareD2R]); @@ -1622,7 +1622,7 @@ void DisplayMan::drawSquareD2R(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackLeftFrontRightFrontLeft; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2R); - drawCeilingPit(k63_ceilingPit_D2L_GraphicIndice, &frameCeilingPitD2R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD2L, &frameCeilingPitD2R, posX, posY, true); break; case kDMElementTypeDoorFront: drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2R); @@ -1634,14 +1634,14 @@ void DisplayMan::drawSquareD2R(Direction dir, int16 posX, int16 posY) { break; case kDMElementTypePit: drawFloorPitOrStairsBitmapFlippedHorizontally( - squareAspect[kDMSquareAspectPitInvisible] ? k57_FloorPir_Invisible_D2L_GraphicIndice : k51_FloorPit_D2L_GraphicIndice, frameFloorPitD2R); + squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD2L : kDMGraphicIdxFloorPitD2L, frameFloorPitD2R); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: order = kDMCellOrderBackRightBackLeftFrontRightFrontLeft; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2R); - drawCeilingPit(k63_ceilingPit_D2L_GraphicIndice, &frameCeilingPitD2R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD2L, &frameCeilingPitD2R, posX, posY, true); break; default: skip = true; @@ -1692,7 +1692,7 @@ void DisplayMan::drawSquareD2C(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2C); - drawCeilingPit(k64_ceilingPitD2C_GraphicIndice, &frameCeilingPitD2C, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD2C, &frameCeilingPitD2C, posX, posY, false); break; case kDMElementTypeWall: drawWallSetBitmapWithoutTransparency(_bitmapWallSetD2LCR, _frameWalls163[kDMViewSquareD2C]); @@ -1716,14 +1716,14 @@ void DisplayMan::drawSquareD2C(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderDoorPass2FrontLeftFrontRight; break; case kDMElementTypePit: - drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? k58_FloorPit_invisible_D2C_GraphicIndice : k52_FloorPit_D2C_GraphicIndice, frameFloorPitD2C); + drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD2C : kDMGraphicIdxFloorPitD2C, frameFloorPitD2C); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2C); - drawCeilingPit(k64_ceilingPitD2C_GraphicIndice, &frameCeilingPitD2C, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD2C, &frameCeilingPitD2C, posX, posY, false); break; default: skip = true; @@ -1774,7 +1774,7 @@ void DisplayMan::drawSquareD1L(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackRightFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1L); - drawCeilingPit(k65_ceilingPitD1L_GraphicIndice, &frameCeilingPitD1L, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD1L, &frameCeilingPitD1L, posX, posY, false); break; case kDMElementTypeWall: drawWallSetBitmap(_bitmapWallSetD1LCR, _frameWalls163[kDMViewSquareD1L]); @@ -1790,7 +1790,7 @@ void DisplayMan::drawSquareD1L(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackRightFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1L); - drawCeilingPit(k65_ceilingPitD1L_GraphicIndice, &frameCeilingPitD1L, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD1L, &frameCeilingPitD1L, posX, posY, false); break; case kDMElementTypeDoorFront: drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1L); @@ -1801,14 +1801,14 @@ void DisplayMan::drawSquareD1L(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderDoorPass2FrontRight; break; case kDMElementTypePit: - drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? k59_floorPit_invisible_D1L_GraphicIndice : k53_FloorPit_D1L_GraphicIndice, frameFloorPitD1L); + drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD1L : kDMGraphicIdxFloorPitD1L, frameFloorPitD1L); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: order = kDMCellOrderBackRightFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1L); - drawCeilingPit(k65_ceilingPitD1L_GraphicIndice, &frameCeilingPitD1L, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD1L, &frameCeilingPitD1L, posX, posY, false); break; default: skip = true; @@ -1858,7 +1858,7 @@ void DisplayMan::drawSquareD1R(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackLeftFrontLeft; drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1R); /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ - drawCeilingPit(k65_ceilingPitD1L_GraphicIndice, &frameCeilingPitD1R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD1L, &frameCeilingPitD1R, posX, posY, true); break; case kDMElementTypeWall: drawWallSetBitmap(_bitmapWallSetD1LCR, _frameWalls163[kDMViewSquareD1R]); @@ -1874,7 +1874,7 @@ void DisplayMan::drawSquareD1R(Direction dir, int16 posX, int16 posY) { case kDMElementTypeDoorSide: order = kDMCellOrderBackLeftFrontLeft; drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1R); /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ - drawCeilingPit(k65_ceilingPitD1L_GraphicIndice, &frameCeilingPitD1R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD1L, &frameCeilingPitD1R, posX, posY, true); break; case kDMElementTypeDoorFront: drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1R); @@ -1885,14 +1885,14 @@ void DisplayMan::drawSquareD1R(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderDoorPass2FrontLeft; break; case kDMElementTypePit: - drawFloorPitOrStairsBitmapFlippedHorizontally(squareAspect[kDMSquareAspectPitInvisible] ? k59_floorPit_invisible_D1L_GraphicIndice - : k53_FloorPit_D1L_GraphicIndice, frameFloorPitD1R); + drawFloorPitOrStairsBitmapFlippedHorizontally(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD1L + : kDMGraphicIdxFloorPitD1L, frameFloorPitD1R); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: order = kDMCellOrderBackLeftFrontLeft; drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1R); /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ - drawCeilingPit(k65_ceilingPitD1L_GraphicIndice, &frameCeilingPitD1R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD1L, &frameCeilingPitD1R, posX, posY, true); break; default: skip = true; @@ -1929,7 +1929,7 @@ void DisplayMan::drawSquareD1C(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1C); - drawCeilingPit(k66_ceilingPitD1C_GraphicIndice, &frameCeilingPitD1C, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD1C, &frameCeilingPitD1C, posX, posY, false); break; case kDMElementTypeWall: _vm->_dungeonMan->_isFacingAlcove = false; @@ -1940,7 +1940,7 @@ void DisplayMan::drawSquareD1C(Direction dir, int16 posX, int16 posY) { blitToBitmap(_bitmapViewport, getDerivedBitmap(kDMDerivedBitmapThievesEyeVisibleArea), boxThievesEyeVisibleArea, _boxThievesEyeViewPortVisibleArea._rect.left, _boxThievesEyeViewPortVisibleArea._rect.top, k112_byteWidthViewport, 48, kDMColorNoTransparency, 136, 95); - byte *bitmap = getNativeBitmapOrGraphic(k41_holeInWall_GraphicIndice); + byte *bitmap = getNativeBitmapOrGraphic(kDMGraphicIdxHoleInWall); blitToBitmap(bitmap, getDerivedBitmap(kDMDerivedBitmapThievesEyeVisibleArea), boxThievesEyeVisibleArea, 0, 0, 48, 48, kDMColorFlesh, 95, 95); } @@ -1970,14 +1970,14 @@ void DisplayMan::drawSquareD1C(Direction dir, int16 posX, int16 posY) { order = kDMCellOrderDoorPass2FrontLeftFrontRight; break; case kDMElementTypePit: - drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? k60_floorPitInvisibleD1C_GraphicIndice : k54_FloorPit_D1C_GraphicIndice, frameFloorPitD1C); + drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD1C : kDMGraphicIdxFloorPitD1C, frameFloorPitD1C); // No break on purpose case kDMElementTypeTeleporter: case kDMElementTypeCorridor: order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight; /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */ drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1C); - drawCeilingPit(k66_ceilingPitD1C_GraphicIndice, &frameCeilingPitD1C, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD1C, &frameCeilingPitD1C, posX, posY, false); break; default: skip = true; @@ -2008,7 +2008,7 @@ void DisplayMan::drawSquareD0L(Direction dir, int16 posX, int16 posY) { drawObjectsCreaturesProjectilesExplosions(Thing(squareAspect[kDMSquareAspectFirstGroupOrObject]), dir, posX, posY, kDMViewSquareD0L, kDMCellOrderBackRight); break; case kDMElementTypePit: - drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? k61_floorPitInvisibleD0L_GraphicIndice : k55_FloorPit_D0L_GraphicIndice, frameFloorPitD0L); + drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD0L : kDMGraphicIdxFloorPitD0L, frameFloorPitD0L); case kDMElementTypeStairsSide: if (squareAspect[kDMSquareAspectStairsUp]) drawFloorPitOrStairsBitmap(_stairsNativeBitmapIndexSideD0L, frameStairsSideD0L); @@ -2017,7 +2017,7 @@ void DisplayMan::drawSquareD0L(Direction dir, int16 posX, int16 posY) { break; } - drawCeilingPit(k67_ceilingPitD0L_grahicIndice, &frameCeilingPitD0L, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD0L, &frameCeilingPitD0L, posX, posY, false); if ((squareAspect[kDMSquareAspectElement] == kDMElementTypeTeleporter) && squareAspect[kDMSquareAspectTeleporterVisible]) drawField(&_fieldAspects188[kDMViewSquareD0L], _frameWalls163[kDMViewSquareD0L]._box); } @@ -2035,12 +2035,12 @@ void DisplayMan::drawSquareD0R(Direction dir, int16 posX, int16 posY) { drawFloorPitOrStairsBitmapFlippedHorizontally(_stairsNativeBitmapIndexSideD0L, frameStairsSideD0R); return; case kDMElementTypePit: - drawFloorPitOrStairsBitmapFlippedHorizontally(squareAspect[kDMSquareAspectPitInvisible] ? k61_floorPitInvisibleD0L_GraphicIndice - : k55_FloorPit_D0L_GraphicIndice, frameFloorPitD0R); + drawFloorPitOrStairsBitmapFlippedHorizontally(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD0L + : kDMGraphicIdxFloorPitD0L, frameFloorPitD0R); case kDMElementTypeCorridor: case kDMElementTypeDoorSide: case kDMElementTypeTeleporter: - drawCeilingPit(k67_ceilingPitD0L_grahicIndice, &frameCeilingPitD0R, posX, posY, true); + drawCeilingPit(kDMGraphicIdxCeilingPitD0L, &frameCeilingPitD0R, posX, posY, true); drawObjectsCreaturesProjectilesExplosions(Thing(squareAspect[kDMSquareAspectFirstGroupOrObject]), dir, posX, posY, kDMViewSquareD0R, kDMCellOrderBackLeft); break; case kDMElementTypeWall: @@ -2068,7 +2068,7 @@ void DisplayMan::drawSquareD0C(Direction dir, int16 posX, int16 posY) { case kDMElementTypeDoorSide: if (_vm->_championMan->_party._event73Count_ThievesEye) { memmove(_tmpBitmap, _bitmapWallSetDoorFrameFront, 32 * 123); - blitToBitmap(getNativeBitmapOrGraphic(k41_holeInWall_GraphicIndice), + blitToBitmap(getNativeBitmapOrGraphic(kDMGraphicIdxHoleInWall), _tmpBitmap, boxThievesEyeHoleInDoorFrame, doorFrameD0C._box._rect.left - _boxThievesEyeViewPortVisibleArea._rect.left, 0, 48, 16, kDMColorGold, 95, 123); drawWallSetBitmap(_tmpBitmap, doorFrameD0C); @@ -2085,10 +2085,10 @@ void DisplayMan::drawSquareD0C(Direction dir, int16 posX, int16 posY) { } break; case kDMElementTypePit: - drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? k62_flootPitInvisibleD0C_graphicIndice : k56_FloorPit_D0C_GraphicIndice, frameFloorPitD0C); + drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD0C : kDMGraphicIdxFloorPitD0C, frameFloorPitD0C); break; } - drawCeilingPit(k68_ceilingPitD0C_graphicIndice, &frameCeilingPitD0C, posX, posY, false); + drawCeilingPit(kDMGraphicIdxCeilingPitD0C, &frameCeilingPitD0C, posX, posY, false); drawObjectsCreaturesProjectilesExplosions(Thing(squareAspect[kDMSquareAspectFirstGroupOrObject]), dir, posX, posY, kDMViewSquareD0C, kDMCellOrderBackLeftBackRight); if ((squareAspect[kDMSquareAspectElement] == kDMElementTypeTeleporter) && squareAspect[kDMSquareAspectTeleporterVisible]) drawField(&_fieldAspects188[kDMViewSquareD0C], _frameWalls163[kDMViewSquareD0C]._box); @@ -2783,7 +2783,7 @@ bool DisplayMan::isDrawnWallOrnAnAlcove(int16 wallOrnOrd, ViewWall viewWallIndex ornCoordSet[4], k112_byteWidthViewport, kDMColorFlesh, ornCoordSet[5], k136_heightViewport); if ((viewWallIndex == kDMViewWallD1CFront) && _championPortraitOrdinal--) { - blitToBitmap(getNativeBitmapOrGraphic(k26_ChampionPortraitsIndice), _bitmapViewport, boxChampionPortraitOnWall, + blitToBitmap(getNativeBitmapOrGraphic(kDMGraphicIdxChampionPortraits), _bitmapViewport, boxChampionPortraitOnWall, (_championPortraitOrdinal & 0x0007) << 5, (_championPortraitOrdinal >> 3) * 29, k128_byteWidth, k112_byteWidthViewport, kDMColorDarkGary, 87, k136_heightViewport); /* A portrait is 32x29 pixels */ } @@ -2831,7 +2831,7 @@ void DisplayMan::drawField(FieldAspect *fieldAspect, Box& box) { if (fieldAspect->_mask != kMaskFieldAspectNoMask) { bitmapMask = _tmpBitmap; - memmove(bitmapMask, getNativeBitmapOrGraphic(k69_FieldMask_D3R_GraphicIndice + getFlag(fieldAspect->_mask, kMaskFieldAspectIndex)), + memmove(bitmapMask, getNativeBitmapOrGraphic(kDMGraphicIdxFieldMaskD3R + getFlag(fieldAspect->_mask, kMaskFieldAspectIndex)), fieldAspect->_height * fieldAspect->_byteWidth * 2); if (getFlag(fieldAspect->_mask, kMaskFieldAspectFlipMask)) { flipBitmapHorizontal(bitmapMask, fieldAspect->_byteWidth, fieldAspect->_height); @@ -2839,7 +2839,7 @@ void DisplayMan::drawField(FieldAspect *fieldAspect, Box& box) { } isDerivedBitmapInCache(kDMDerivedBitmapViewport); - byte *bitmap = getNativeBitmapOrGraphic(k73_FieldTeleporterGraphicIndice + fieldAspect->_nativeBitmapRelativeIndex); + byte *bitmap = getNativeBitmapOrGraphic(kDMGraphicIdxFieldTeleporter + fieldAspect->_nativeBitmapRelativeIndex); blitBoxFilledWithMaskedBitmap(bitmap, _bitmapViewport, bitmapMask, getDerivedBitmap(kDMDerivedBitmapViewport), box, _vm->getRandomNumber(2) + fieldAspect->_baseStartUnitIndex, _vm->getRandomNumber(32), k112_byteWidthViewport, (Color)fieldAspect->_transparentColor, fieldAspect->_xPos, 0, 136, fieldAspect->_bitplaneWordCount); @@ -3162,7 +3162,7 @@ void DisplayMan::drawObjectsCreaturesProjectilesExplosions(Thing thingParam, Dir if ((viewSquareIndex >= kDMViewSquareD3C) && (viewSquareIndex <= kDMViewSquareD0C) && (thingParam.getCell() == cellYellowBear)) { /* Square where objects are visible and object is located on cell being processed */ objectAspect = &(_objectAspects209[_vm->_dungeonMan->_objectInfos[_vm->_dungeonMan->getObjectInfoIndex(thingParam)]._objectAspectIndex]); - AL_4_nativeBitmapIndex = k360_FirstObjectGraphicIndice + objectAspect->_firstNativeBitmapRelativeIndex; + AL_4_nativeBitmapIndex = kDMGraphicIdxFirstObject + objectAspect->_firstNativeBitmapRelativeIndex; useAlcoveObjectImage = (L0135_B_DrawAlcoveObjects && getFlag(objectAspect->_graphicInfo, k0x0010_ObjectAlcoveMask) && (viewLane == kDMViewLaneCenter)); if (useAlcoveObjectImage) AL_4_nativeBitmapIndex++; @@ -3355,7 +3355,7 @@ T0115077_DrawSecondHalfSquareCreature: if (!coordinateSet[1]) goto T0115126_CreatureNotVisible; creatureGraphicInfoRed = creatureGraphicInfoGreen; - AL_4_nativeBitmapIndex = k446_FirstCreatureGraphicIndice + ((CreatureAspect *)objectAspect)->_firstNativeBitmapRelativeIndex; /* By default, assume using the front image */ + AL_4_nativeBitmapIndex = kDMGraphicIdxFirstCreature + ((CreatureAspect *)objectAspect)->_firstNativeBitmapRelativeIndex; /* By default, assume using the front image */ derivedBitmapIndex = ((CreatureAspect *)objectAspect)->_firstDerivedBitmapIndex; int16 sourceByteWidth; int16 sourceHeight; @@ -3544,7 +3544,7 @@ T0115129_DrawProjectiles: AL_4_projectileAspect = _vm->_dungeonMan->getProjectileAspect(projectile->_slot); if (AL_4_projectileAspect < 0) { /* Negative value: projectile aspect is the ordinal of a PROJECTIL_ASPECT */ objectAspect = (ObjectAspect *)&_projectileAspect[_vm->ordinalToIndex(-AL_4_projectileAspect)]; - AL_4_nativeBitmapIndex = ((ProjectileAspect *)objectAspect)->_firstNativeBitmapRelativeIndex + k316_FirstProjectileGraphicIndice; + AL_4_nativeBitmapIndex = ((ProjectileAspect *)objectAspect)->_firstNativeBitmapRelativeIndex + kDMGraphicIdxFirstProjectile; projectileAspectType = getFlag(((ProjectileAspect *)objectAspect)->_graphicInfo, k0x0003_ProjectileAspectTypeMask); bool doNotScaleWithKineticEnergy = !getFlag(((ProjectileAspect *)objectAspect)->_graphicInfo, k0x0100_ProjectileScaleWithKineticEnergyMask); @@ -3650,7 +3650,7 @@ T0115129_DrawProjectiles: projectileCoordinates[1] = 47; coordinateSet = projectileCoordinates; objectAspect = &_objectAspects209[AL_4_projectileAspect]; - AL_4_nativeBitmapIndex = objectAspect->_firstNativeBitmapRelativeIndex + k360_FirstObjectGraphicIndice; + AL_4_nativeBitmapIndex = objectAspect->_firstNativeBitmapRelativeIndex + kDMGraphicIdxFirstObject; drawProjectileAsObject = true; goto T0115015_DrawProjectileAsObject; /* Go to code section to draw an object. Once completed, it jumps back to T0115171_BackFromT0115015_DrawProjectileAsObject below */ } @@ -3689,7 +3689,7 @@ T0115171_BackFromT0115015_DrawProjectileAsObject:; } else { if (AL_4_explosionType == kDMExplosionTypeRebirthStep1) { objectAspect = (ObjectAspect *)&_projectileAspect[_vm->ordinalToIndex(-_vm->_dungeonMan->getProjectileAspect(Thing::_explLightningBolt))]; - bitmapRedBanana = getNativeBitmapOrGraphic(((ProjectileAspect *)objectAspect)->_firstNativeBitmapRelativeIndex + (k316_FirstProjectileGraphicIndice + 1)); + bitmapRedBanana = getNativeBitmapOrGraphic(((ProjectileAspect *)objectAspect)->_firstNativeBitmapRelativeIndex + (kDMGraphicIdxFirstProjectile + 1)); explosionCoordinates = rebirthStep1ExplosionCoordinates[AL_1_viewSquareExplosionIndex - 3]; byteWidth = getScaledDimension((((ProjectileAspect *)objectAspect)->_byteWidth), explosionCoordinates[2]); heightRedEagle = getScaledDimension((((ProjectileAspect *)objectAspect)->_height), explosionCoordinates[2]); @@ -3719,7 +3719,7 @@ T0115171_BackFromT0115015_DrawProjectileAsObject:; AL_4_explosionAspectIndex++; /* Use third graphic in the pattern for large explosion attack */ } isDerivedBitmapInCache(kDMDerivedBitmapViewport); - bitmapRedBanana = getNativeBitmapOrGraphic(AL_4_explosionAspectIndex + k351_FirstExplosionPatternGraphicIndice); + bitmapRedBanana = getNativeBitmapOrGraphic(AL_4_explosionAspectIndex + kDMGraphicIdxFirstExplosionPattern); if (smoke) { blitToBitmapShrinkWithPalChange(bitmapRedBanana, _tmpBitmap, 48, 32, 48, 32, _palChangeSmoke); bitmapRedBanana = _tmpBitmap; diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index ff44f951d5..8c58ed8cbf 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -200,6 +200,85 @@ enum Color { kDMColorWhite = 15 }; +enum GraphicIndice { + kDMGraphicIdxDialogBox = 0, // @ C000_GRAPHIC_DIALOG_BOX + kDMGraphicIdxTitle = 1, // @ C001_GRAPHIC_TITLE + kDMGraphicIdxEntranceLeftDoor = 2, // @ C002_GRAPHIC_ENTRANCE_LEFT_DOOR + kDMGraphicIdxEntranceRightDoor = 3, // @ C003_GRAPHIC_ENTRANCE_RIGHT_DOOR + kDMGraphicIdxEntrance = 4, // @ C004_GRAPHIC_ENTRANCE + kDMGraphicIdxCredits = 5, // @ C005_GRAPHIC_CREDITS + kDMGraphicIdxTheEnd = 6, // @ C006_GRAPHIC_THE_END + kDMGraphicIdxStatusBoxDeadChampion = 8, // @ C008_GRAPHIC_STATUS_BOX_DEAD_CHAMPION + kDMGraphicIdxMenuSpellAreaBackground = 9, // @ C009_GRAPHIC_MENU_SPELL_AREA_BACKGROUND + kDMGraphicIdxMenuActionArea = 10, // @ C010_GRAPHIC_MENU_ACTION_AREA + kDMGraphicIdxMenuSpellAreLines = 11, // @ C011_GRAPHIC_MENU_SPELL_AREA_LINES + kDMGraphicIdxMovementArrows = 13, // @ C013_GRAPHIC_MOVEMENT_ARROWS + kDMGraphicIdxDamageToCreature = 14, // @ C014_GRAPHIC_DAMAGE_TO_CREATURE + kDMGraphicIdxDamageToChampionSmall = 15, // @ C015_GRAPHIC_DAMAGE_TO_CHAMPION_SMALL + kDMGraphicIdxDamageToChampionBig = 16, // @ C016_GRAPHIC_DAMAGE_TO_CHAMPION_BIG + kDMGraphicIdxInventory = 17, // @ C017_GRAPHIC_INVENTORY + kDMGraphicIdxArrowForChestContent = 18, // @ C018_GRAPHIC_ARROW_FOR_CHEST_CONTENT + kDMGraphicIdxEyeForObjectDescription = 19, // @ C019_GRAPHIC_EYE_FOR_OBJECT_DESCRIPTION + kDMGraphicIdxPanelEmpty = 20, // @ C020_GRAPHIC_PANEL_EMPTY + kDMGraphicIdxPanelOpenScroll = 23, // @ C023_GRAPHIC_PANEL_OPEN_SCROLL + kDMGraphicIdxPanelOpenChest = 25, // @ C025_GRAPHIC_PANEL_OPEN_CHEST + kDMGraphicIdxChampionPortraits = 26, // @ C026_GRAPHIC_CHAMPION_PORTRAITS + kDMGraphicIdxPanelRenameChampion = 27, // @ C027_GRAPHIC_PANEL_RENAME_CHAMPION + kDMGraphicIdxChampionIcons = 28, // @ C028_GRAPHIC_CHAMPION_ICONS + kDMGraphicIdxObjectDescCircle = 29, // @ C029_GRAPHIC_OBJECT_DESCRIPTION_CIRCLE + kDMGraphicIdxFoodLabel = 30, // @ C030_GRAPHIC_FOOD_LABEL + kDMGraphicIdxWaterLabel = 31, // @ C031_GRAPHIC_WATER_LABEL + kDMGraphicIdxPoisionedLabel = 32, // @ C032_GRAPHIC_POISONED_LABEL + kDMGraphicIdxSlotBoxNormal = 33, // @ C033_GRAPHIC_SLOT_BOX_NORMAL + kDMGraphicIdxSlotBoxWounded = 34, // @ C034_GRAPHIC_SLOT_BOX_WOUNDED + kDMGraphicIdxSlotBoxActingHand = 35, // @ C035_GRAPHIC_SLOT_BOX_ACTING_HAND + kDMGraphicIdxBorderPartyShield = 37, // @ C037_GRAPHIC_BORDER_PARTY_SHIELD + kDMGraphicIdxBorderPartyFireshield = 38, // @ C038_GRAPHIC_BORDER_PARTY_FIRESHIELD + kDMGraphicIdxBorderPartySpellshield = 39, // @ C039_GRAPHIC_BORDER_PARTY_SPELLSHIELD + kDMGraphicIdxPanelResurectReincarnate = 40, // @ C040_GRAPHIC_PANEL_RESURRECT_REINCARNATE + kDMGraphicIdxHoleInWall = 41, // @ C041_GRAPHIC_HOLE_IN_WALL + kDMGraphicIdxObjectIcons000To031 = 42, // @ C042_GRAPHIC_OBJECT_ICONS_000_TO_031 + kDMGraphicIdxObjectIcons032To063 = 43, // @ C043_GRAPHIC_OBJECT_ICONS_032_TO_063 + kDMGraphicIdxObjectIcons064To095 = 44, // @ C044_GRAPHIC_OBJECT_ICONS_064_TO_095 + kDMGraphicIdxObjectIcons096To127 = 45, // @ C045_GRAPHIC_OBJECT_ICONS_096_TO_127 + kDMGraphicIdxObjectIcons128To159 = 46, // @ C046_GRAPHIC_OBJECT_ICONS_128_TO_159 + kDMGraphicIdxObjectIcons160To191 = 47, // @ C047_GRAPHIC_OBJECT_ICONS_160_TO_191 + kDMGraphicIdxObjectIcons192To223 = 48, // @ C048_GRAPHIC_OBJECT_ICONS_192_TO_223 + kDMGraphicIdxFloorPitD3L = 49, // @ C049_GRAPHIC_FLOOR_PIT_D3L + kDMGraphicIdxFloorPitD3C = 50, // @ C050_GRAPHIC_FLOOR_PIT_D3C + kDMGraphicIdxFloorPitD2L = 51, // @ C051_GRAPHIC_FLOOR_PIT_D2L + kDMGraphicIdxFloorPitD2C = 52, // @ C052_GRAPHIC_FLOOR_PIT_D2C + kDMGraphicIdxFloorPitD1L = 53, // @ C053_GRAPHIC_FLOOR_PIT_D1L + kDMGraphicIdxFloorPitD1C = 54, // @ C054_GRAPHIC_FLOOR_PIT_D1C + kDMGraphicIdxFloorPitD0L = 55, // @ C055_GRAPHIC_FLOOR_PIT_D0L + kDMGraphicIdxFloorPitD0C = 56, // @ C056_GRAPHIC_FLOOR_PIT_D0C + kDMGraphicIdxFloorPitInvisibleD2L = 57, // @ C057_GRAPHIC_FLOOR_PIT_INVISIBLE_D2L + kDMGraphicIdxFloorPitInvisibleD2C = 58, // @ C058_GRAPHIC_FLOOR_PIT_INVISIBLE_D2C + kDMGraphicIdxFloorPitInvisibleD1L = 59, // @ C059_GRAPHIC_FLOOR_PIT_INVISIBLE_D1L + kDMGraphicIdxFloorPitInvisibleD1C = 60, // @ C060_GRAPHIC_FLOOR_PIT_INVISIBLE_D1C + kDMGraphicIdxFloorPitInvisibleD0L = 61, // @ C061_GRAPHIC_FLOOR_PIT_INVISIBLE_D0L + kDMGraphicIdxFloorPitInvisibleD0C = 62, // @ C062_GRAPHIC_FLOOR_PIT_INVISIBLE_D0C + kDMGraphicIdxCeilingPitD2L = 63, // @ C063_GRAPHIC_CEILING_PIT_D2L + kDMGraphicIdxCeilingPitD2C = 64, // @ C064_GRAPHIC_CEILING_PIT_D2C + kDMGraphicIdxCeilingPitD1L = 65, // @ C065_GRAPHIC_CEILING_PIT_D1L + kDMGraphicIdxCeilingPitD1C = 66, // @ C066_GRAPHIC_CEILING_PIT_D1C + kDMGraphicIdxCeilingPitD0L = 67, // @ C067_GRAPHIC_CEILING_PIT_D0L + kDMGraphicIdxCeilingPitD0C = 68, // @ C068_GRAPHIC_CEILING_PIT_D0C + kDMGraphicIdxFieldMaskD3R = 69, // @ C069_GRAPHIC_FIELD_MASK_D3R + kDMGraphicIdxFieldTeleporter = 73, // @ C073_GRAPHIC_FIELD_TELEPORTER + kDMGraphicIdxInscriptionFont = 120, // @ C120_GRAPHIC_INSCRIPTION_FONT + kDMGraphicIdxWallOrnChampMirror = 208, // @ C208_GRAPHIC_WALL_ORNAMENT_43_CHAMPION_MIRROR + kDMGraphicIdxFloorOrnD3LFootprints = 241, // @ C241_GRAPHIC_FLOOR_ORNAMENT_15_D3L_FOOTPRINTS + kDMGraphicIdxDoorMaskDestroyed = 301, // @ C301_GRAPHIC_DOOR_MASK_DESTROYED + kDMGraphicIdxFirstDoorButton = 315, // @ C315_GRAPHIC_FIRST_DOOR_BUTTON + kDMGraphicIdxFirstProjectile = 316, // @ C316_GRAPHIC_FIRST_PROJECTILE + kDMGraphicIdxFirstExplosion = 348, // @ C348_GRAPHIC_FIRST_EXPLOSION + kDMGraphicIdxFirstExplosionPattern = 351, // @ C351_GRAPHIC_FIRST_EXPLOSION_PATTERN + kDMGraphicIdxFirstObject = 360, // @ C360_GRAPHIC_FIRST_OBJECT + kDMGraphicIdxFirstCreature = 446, // @ C446_GRAPHIC_FIRST_CREATURE + kDMGraphicIdxFont = 557 // @ C557_GRAPHIC_FONT +}; + #define kDMMaskDoorInfoCreaturesCanSeeThrough 0x0001 // @ MASK0x0001_CREATURES_CAN_SEE_THROUGH #define kDMMaskDoorInfoProjectilesCanPassThrough 0x0002 // @ MASK0x0002_PROJECTILES_CAN_PASS_THROUGH #define kDMMaskDoorInfoAnimated 0x0004 // @ MASK0x0004_ANIMATED @@ -281,85 +360,6 @@ enum Color { #define k0x0080_BlitDoNotUseMask 0x0080 // @ MASK0x0080_DO_NOT_USE_MASK #define kScaleThreshold 32768 -enum GraphicIndice { - k0_dialogBoxGraphicIndice = 0, // @ C000_GRAPHIC_DIALOG_BOX - k1_titleGraphicsIndice = 1, // @ C001_GRAPHIC_TITLE - k2_entranceLeftDoorGraphicIndice = 2, // @ C002_GRAPHIC_ENTRANCE_LEFT_DOOR - k3_entranceRightDoorGraphicIndice = 3, // @ C003_GRAPHIC_ENTRANCE_RIGHT_DOOR - k4_entranceGraphicIndice = 4, // @ C004_GRAPHIC_ENTRANCE - k5_creditsGraphicIndice = 5, // @ C005_GRAPHIC_CREDITS - k6_theEndIndice = 6, // @ C006_GRAPHIC_THE_END - k8_StatusBoxDeadChampion = 8, // @ C008_GRAPHIC_STATUS_BOX_DEAD_CHAMPION - k9_MenuSpellAreaBackground = 9, // @ C009_GRAPHIC_MENU_SPELL_AREA_BACKGROUND - k10_MenuActionAreaIndice = 10, // @ C010_GRAPHIC_MENU_ACTION_AREA - k11_MenuSpellAreLinesIndice = 11, // @ C011_GRAPHIC_MENU_SPELL_AREA_LINES - k13_MovementArrowsIndice = 13, // @ C013_GRAPHIC_MOVEMENT_ARROWS - k14_damageToCreatureIndice = 14, // @ C014_GRAPHIC_DAMAGE_TO_CREATURE - k15_damageToChampionSmallIndice = 15, // @ C015_GRAPHIC_DAMAGE_TO_CHAMPION_SMALL - k16_damageToChampionBig = 16, // @ C016_GRAPHIC_DAMAGE_TO_CHAMPION_BIG - k17_InventoryGraphicIndice = 17, // @ C017_GRAPHIC_INVENTORY - k18_ArrowForChestContentIndice = 18, // @ C018_GRAPHIC_ARROW_FOR_CHEST_CONTENT - k19_EyeForObjectDescriptionIndice = 19, // @ C019_GRAPHIC_EYE_FOR_OBJECT_DESCRIPTION - k20_PanelEmptyIndice = 20, // @ C020_GRAPHIC_PANEL_EMPTY - k23_PanelOpenScrollIndice = 23, // @ C023_GRAPHIC_PANEL_OPEN_SCROLL - k25_PanelOpenChestIndice = 25, // @ C025_GRAPHIC_PANEL_OPEN_CHEST - k26_ChampionPortraitsIndice = 26, // @ C026_GRAPHIC_CHAMPION_PORTRAITS - k27_PanelRenameChampionIndice = 27, // @ C027_GRAPHIC_PANEL_RENAME_CHAMPION - k28_ChampionIcons = 28, // @ C028_GRAPHIC_CHAMPION_ICONS - k29_ObjectDescCircleIndice = 29, // @ C029_GRAPHIC_OBJECT_DESCRIPTION_CIRCLE - k30_FoodLabelIndice = 30, // @ C030_GRAPHIC_FOOD_LABEL - k31_WaterLabelIndice = 31, // @ C031_GRAPHIC_WATER_LABEL - k32_PoisionedLabelIndice = 32, // @ C032_GRAPHIC_POISONED_LABEL - k33_SlotBoxNormalIndice = 33, // @ C033_GRAPHIC_SLOT_BOX_NORMAL - k34_SlotBoxWoundedIndice = 34, // @ C034_GRAPHIC_SLOT_BOX_WOUNDED - k35_SlotBoxActingHandIndice = 35, // @ C035_GRAPHIC_SLOT_BOX_ACTING_HAND - k37_BorderPartyShieldIndice = 37, // @ C037_GRAPHIC_BORDER_PARTY_SHIELD - k38_BorderPartyFireshieldIndice = 38, // @ C038_GRAPHIC_BORDER_PARTY_FIRESHIELD - k39_BorderPartySpellshieldIndice = 39, // @ C039_GRAPHIC_BORDER_PARTY_SPELLSHIELD - k40_PanelResurectReincaranteIndice = 40, // @ C040_GRAPHIC_PANEL_RESURRECT_REINCARNATE - k41_holeInWall_GraphicIndice = 41, // @ C041_GRAPHIC_HOLE_IN_WALL - k42_ObjectIcons_000_TO_031 = 42, // @ C042_GRAPHIC_OBJECT_ICONS_000_TO_031 - k43_ObjectIcons_032_TO_063 = 43, // @ C043_GRAPHIC_OBJECT_ICONS_032_TO_063 - k44_ObjectIcons_064_TO_095 = 44, // @ C044_GRAPHIC_OBJECT_ICONS_064_TO_095 - k45_ObjectIcons_096_TO_127 = 45, // @ C045_GRAPHIC_OBJECT_ICONS_096_TO_127 - k46_ObjectIcons_128_TO_159 = 46, // @ C046_GRAPHIC_OBJECT_ICONS_128_TO_159 - k47_ObjectIcons_160_TO_191 = 47, // @ C047_GRAPHIC_OBJECT_ICONS_160_TO_191 - k48_ObjectIcons_192_TO_223 = 48, // @ C048_GRAPHIC_OBJECT_ICONS_192_TO_223 - k49_FloorPit_D3L_GraphicIndice = 49, // @ C049_GRAPHIC_FLOOR_PIT_D3L - k50_FloorPit_D3C_GraphicIndice = 50, // @ C050_GRAPHIC_FLOOR_PIT_D3C - k51_FloorPit_D2L_GraphicIndice = 51, // @ C051_GRAPHIC_FLOOR_PIT_D2L - k52_FloorPit_D2C_GraphicIndice = 52, // @ C052_GRAPHIC_FLOOR_PIT_D2C - k53_FloorPit_D1L_GraphicIndice = 53, // @ C053_GRAPHIC_FLOOR_PIT_D1L - k54_FloorPit_D1C_GraphicIndice = 54, // @ C054_GRAPHIC_FLOOR_PIT_D1C - k55_FloorPit_D0L_GraphicIndice = 55, // @ C055_GRAPHIC_FLOOR_PIT_D0L - k56_FloorPit_D0C_GraphicIndice = 56, // @ C056_GRAPHIC_FLOOR_PIT_D0C - k57_FloorPir_Invisible_D2L_GraphicIndice = 57, // @ C057_GRAPHIC_FLOOR_PIT_INVISIBLE_D2L - k58_FloorPit_invisible_D2C_GraphicIndice = 58, // @ C058_GRAPHIC_FLOOR_PIT_INVISIBLE_D2C - k59_floorPit_invisible_D1L_GraphicIndice = 59, // @ C059_GRAPHIC_FLOOR_PIT_INVISIBLE_D1L - k60_floorPitInvisibleD1C_GraphicIndice = 60, // @ C060_GRAPHIC_FLOOR_PIT_INVISIBLE_D1C - k61_floorPitInvisibleD0L_GraphicIndice = 61, // @ C061_GRAPHIC_FLOOR_PIT_INVISIBLE_D0L - k62_flootPitInvisibleD0C_graphicIndice = 62, // @ C062_GRAPHIC_FLOOR_PIT_INVISIBLE_D0C - k63_ceilingPit_D2L_GraphicIndice = 63, // @ C063_GRAPHIC_CEILING_PIT_D2L - k64_ceilingPitD2C_GraphicIndice = 64, // @ C064_GRAPHIC_CEILING_PIT_D2C - k65_ceilingPitD1L_GraphicIndice = 65, // @ C065_GRAPHIC_CEILING_PIT_D1L - k66_ceilingPitD1C_GraphicIndice = 66, // @ C066_GRAPHIC_CEILING_PIT_D1C - k67_ceilingPitD0L_grahicIndice = 67, // @ C067_GRAPHIC_CEILING_PIT_D0L - k68_ceilingPitD0C_graphicIndice = 68, // @ C068_GRAPHIC_CEILING_PIT_D0C - k69_FieldMask_D3R_GraphicIndice = 69, // @ C069_GRAPHIC_FIELD_MASK_D3R - k73_FieldTeleporterGraphicIndice = 73, // @ C073_GRAPHIC_FIELD_TELEPORTER - k120_InscriptionFontIndice = 120, // @ C120_GRAPHIC_INSCRIPTION_FONT - k208_wallOrn_43_champMirror = 208, // @ C208_GRAPHIC_WALL_ORNAMENT_43_CHAMPION_MIRROR - k241_FloorOrn_15_D3L_footprints = 241, // @ C241_GRAPHIC_FLOOR_ORNAMENT_15_D3L_FOOTPRINTS - k301_DoorMaskDestroyedIndice = 301, // @ C301_GRAPHIC_DOOR_MASK_DESTROYED - k315_firstDoorButton_GraphicIndice = 315, // @ C315_GRAPHIC_FIRST_DOOR_BUTTON - k316_FirstProjectileGraphicIndice = 316, // @ C316_GRAPHIC_FIRST_PROJECTILE - k348_FirstExplosionGraphicIndice = 348, // @ C348_GRAPHIC_FIRST_EXPLOSION - k351_FirstExplosionPatternGraphicIndice = 351, // @ C351_GRAPHIC_FIRST_EXPLOSION_PATTERN - k360_FirstObjectGraphicIndice = 360, // @ C360_GRAPHIC_FIRST_OBJECT - k446_FirstCreatureGraphicIndice = 446, // @ C446_GRAPHIC_FIRST_CREATURE - k557_FontGraphicIndice = 557 // @ C557_GRAPHIC_FONT -}; - class ExplosionAspect { public: uint16 _byteWidth; diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp index e45f31e5ee..a375494d35 100644 --- a/engines/dm/inventory.cpp +++ b/engines/dm/inventory.cpp @@ -128,7 +128,7 @@ void InventoryMan::toggleInventory(ChampionIndex championIndex) { _vm->_displayMan->shadeScreenBox(&_vm->_displayMan->_boxMovementArrows, kDMColorBlack); Champion *champion = &_vm->_championMan->_champions[championIndex]; - _vm->_displayMan->loadIntoBitmap(k17_InventoryGraphicIndice, _vm->_displayMan->_bitmapViewport); + _vm->_displayMan->loadIntoBitmap(kDMGraphicIdxInventory, _vm->_displayMan->_bitmapViewport); if (_vm->_championMan->_candidateChampionOrdinal) _vm->_displayMan->fillBoxBitmap(_vm->_displayMan->_bitmapViewport, boxFloppyZzzCross, kDMColorDarkestGray, k112_byteWidthViewport, k136_heightViewport); @@ -206,26 +206,26 @@ void InventoryMan::drawPanelFoodWaterPoisoned() { Champion &champ = _vm->_championMan->_champions[_inventoryChampionOrdinal]; closeChest(); DisplayMan &dispMan = *_vm->_displayMan; - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k20_PanelEmptyIndice), _boxPanel, k72_byteWidth, kDMColorRed, 73); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelEmpty), _boxPanel, k72_byteWidth, kDMColorRed, 73); switch (_vm->getGameLanguage()) { // localized default: case Common::EN_ANY: - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k30_FoodLabelIndice), boxFood, k24_byteWidth, kDMColorDarkestGray, 9); - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k31_WaterLabelIndice), boxWater, k24_byteWidth, kDMColorDarkestGray, 9); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxFoodLabel), boxFood, k24_byteWidth, kDMColorDarkestGray, 9); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxWaterLabel), boxWater, k24_byteWidth, kDMColorDarkestGray, 9); break; case Common::DE_DEU: - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k30_FoodLabelIndice), boxFood, k32_byteWidth, kDMColorDarkestGray, 9); - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k31_WaterLabelIndice), boxWater, k32_byteWidth, kDMColorDarkestGray, 9); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxFoodLabel), boxFood, k32_byteWidth, kDMColorDarkestGray, 9); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxWaterLabel), boxWater, k32_byteWidth, kDMColorDarkestGray, 9); break; case Common::FR_FRA: - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k30_FoodLabelIndice), boxFood, k48_byteWidth, kDMColorDarkestGray, 9); - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k31_WaterLabelIndice), boxWater, k24_byteWidth, kDMColorDarkestGray, 9); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxFoodLabel), boxFood, k48_byteWidth, kDMColorDarkestGray, 9); + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxWaterLabel), boxWater, k24_byteWidth, kDMColorDarkestGray, 9); break; } if (champ._poisonEventCount) - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k32_PoisionedLabelIndice), + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPoisionedLabel), boxPoisoned, k48_byteWidth, kDMColorDarkestGray, 15); drawPanelFoodOrWaterBar(champ._food, 69, kDMColorLightBrown); @@ -234,7 +234,7 @@ void InventoryMan::drawPanelFoodWaterPoisoned() { void InventoryMan::drawPanelResurrectReincarnate() { _panelContent = kDMPanelContentResurrectReincarnate; - _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k40_PanelResurectReincaranteIndice), + _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelResurectReincarnate), _boxPanel, k72_byteWidth, kDMColorDarkGreen, 73); } @@ -315,7 +315,7 @@ void InventoryMan::drawPanelScroll(Scroll *scroll) { charRed++; *charRed = '\0'; - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k23_PanelOpenScrollIndice), + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelOpenScroll), _boxPanel, k72_byteWidth, kDMColorRed, 73); int16 lineCount = 1; charRed++; @@ -367,7 +367,7 @@ void InventoryMan::openAndDrawChest(Thing thingToOpen, Container *chest, bool is if (!isPressingEye) { objMan.drawIconInSlotBox(kDMSlotBoxInventoryActionHand, kDMIconIndiceContainerChestOpen); } - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k25_PanelOpenChestIndice), + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelOpenChest), _boxPanel, k72_byteWidth, kDMColorRed, 73); int16 chestSlotIndex = 0; Thing thing = chest->getSlot(); @@ -470,7 +470,7 @@ void InventoryMan::drawPanelArrowOrEye(bool pressingEye) { static Box boxArrowOrEye(83, 98, 57, 65); // @ G0033_s_Graphic562_Box_ArrowOrEye DisplayMan &dispMan = *_vm->_displayMan; - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(pressingEye ? k19_EyeForObjectDescriptionIndice : k18_ArrowForChestContentIndice), + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(pressingEye ? kDMGraphicIdxEyeForObjectDescription : kDMGraphicIdxArrowForChestContent), boxArrowOrEye, k8_byteWidth, kDMColorRed, 9); } @@ -495,9 +495,9 @@ void InventoryMan::drawPanelObject(Thing thingToDraw, bool pressingEye) { openAndDrawChest(thingToDraw, (Container *)rawThingPtr, pressingEye); else { IconIndice iconIndex = objMan.getIconIndex(thingToDraw); - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k20_PanelEmptyIndice), + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelEmpty), _boxPanel, k72_byteWidth, kDMColorRed, 73); - dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k29_ObjectDescCircleIndice), + dispMan.blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxObjectDescCircle), boxObjectDescCircle, k16_byteWidth, kDMColorDarkestGray, 27); Common::String descString; @@ -801,7 +801,7 @@ void InventoryMan::drawChampionSkillsAndStatistics() { closeChest(); uint16 championIndex = _vm->ordinalToIndex(_inventoryChampionOrdinal); Champion *curChampion = &_vm->_championMan->_champions[championIndex]; - _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(k20_PanelEmptyIndice), _boxPanel, k72_byteWidth, kDMColorRed, 73); + _vm->_displayMan->blitToViewport(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxPanelEmpty), _boxPanel, k72_byteWidth, kDMColorRed, 73); int16 textPosY = 58; for (uint16 idx = kDMSkillFighter; idx <= kDMSkillWizard; idx++) { int16 skillLevel = MIN((uint16)16, _vm->_championMan->getSkillLevel(championIndex, idx | kDMIgnoreTemporaryExperience)); diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 5cbb4697d4..bfe9c35101 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -168,7 +168,7 @@ MenuMan::~MenuMan() { void MenuMan::drawMovementArrows() { _vm->_eventMan->showMouse(); - _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(k13_MovementArrowsIndice), + _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxMovementArrows), &_vm->_displayMan->_boxMovementArrows, k48_byteWidth, kDMColorNoTransparency, 45); _vm->_eventMan->hideMouse(); } @@ -316,7 +316,7 @@ void MenuMan::drawActionArea() { box = _boxActionArea2ActionMenu; if (_actionList._actionIndices[1] == kDMActionNone) box = _boxActionArea1ActionMenu; - dispMan.blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(k10_MenuActionAreaIndice), + dispMan.blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxMenuActionArea), &box, k48_byteWidth, kDMColorNoTransparency, 45); textMan.printWithTrailingSpaces(dispMan._bitmapScreen, k160_byteWidthScreen, 235, 83, kDMColorBlack, kDMColorCyan, champMan._champions[_vm->ordinalToIndex(champMan._actingChampionOrdinal)]._name, @@ -459,7 +459,7 @@ void MenuMan::setMagicCasterAndDrawSpellArea(ChampionIndex champIndex) { if (_vm->_championMan->_magicCasterChampionIndex == kDMChampionNone) { _vm->_eventMan->showMouse(); - _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(k9_MenuSpellAreaBackground), &_boxSpellArea, k48_byteWidth, kDMColorNoTransparency, 33); + _vm->_displayMan->blitToScreen(_vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxMenuSpellAreaBackground), &_boxSpellArea, k48_byteWidth, kDMColorNoTransparency, 33); _vm->_eventMan->hideMouse(); } if (champIndex == kDMChampionNone) { @@ -1761,7 +1761,7 @@ void MenuMan::drawActionDamage(int16 damage) { int16 displayHeight; if (damage > 40) { blitBox = &_boxActionArea3ActionMenu; - blitBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(k14_damageToCreatureIndice); + blitBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxDamageToCreature); byteWidth = k48_byteWidth; displayHeight = 45; } else { @@ -1780,7 +1780,7 @@ void MenuMan::drawActionDamage(int16 damage) { } displayHeight = 37; if (!_vm->_displayMan->isDerivedBitmapInCache(derivedBitmapIndex)) { - byte *nativeBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(k14_damageToCreatureIndice); + byte *nativeBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxDamageToCreature); blitBitmap = _vm->_displayMan->getDerivedBitmap(derivedBitmapIndex); _vm->_displayMan->blitToBitmapShrinkWithPalChange(nativeBitmap, blitBitmap, 96, 45, destPixelWidth, 37, _vm->_displayMan->_palChangesNoChanges); _vm->_displayMan->addDerivedBitmap(derivedBitmapIndex); diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index face711e52..3b191e877c 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -191,7 +191,7 @@ void ObjectMan::extractIconFromBitmap(uint16 iconIndex, byte *destBitmap) { break; } --counter; - byte *iconBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(k42_ObjectIcons_000_TO_031 + counter); + byte *iconBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxObjectIcons000To031 + counter); iconIndex -= _iconGraphicFirstIndex[counter]; _vm->_displayMan->_useByteBoxCoordinates = true; Box blitBox(0, 15, 0, 15); @@ -216,7 +216,7 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { break; } iconGraphicIndex--; - byte *iconBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(iconGraphicIndex + k42_ObjectIcons_000_TO_031); + byte *iconBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(iconGraphicIndex + kDMGraphicIdxObjectIcons000To031); iconIndex -= _iconGraphicFirstIndex[iconGraphicIndex]; int16 byteWidth; byte* blitDestination; diff --git a/engines/dm/text.cpp b/engines/dm/text.cpp index 922b3acf91..825c86a3b9 100644 --- a/engines/dm/text.cpp +++ b/engines/dm/text.cpp @@ -60,7 +60,7 @@ void TextMan::printTextToBitmap(byte *destBitmap, uint16 destByteWidth, int16 de uint16 textLength = strlen(text); uint16 nextX = destX; uint16 nextY = destY; - byte *srcBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(k557_FontGraphicIndice); + byte *srcBitmap = _vm->_displayMan->getNativeBitmapOrGraphic(kDMGraphicIdxFont); byte *tmp = _vm->_displayMan->_tmpBitmap; for (uint16 i = 0; i < (kDMFontLetterWidth + 1) * kDMFontLetterHeight * 128; ++i) -- cgit v1.2.3