thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DM: Massive renameing in gfx.cpp

Browse source
This commit is contained in:
Bendegúz Nagy 2016-07-02 01:19:53 +02:00
parent e2300bd04c
commit da317f14be
7 changed files with 345 additions and 430 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/dm/champion.cpp
View file

@ -802,7 +802,7 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) {
} else { } else {
AL_2_nativeBitmapIndex = k33_SlotBoxNormalIndice; AL_2_nativeBitmapIndex = k33_SlotBoxNormalIndice;
} }
dispMan.blitToScreen(dispMan.getBitmap(AL_2_nativeBitmapIndex), 32, 0, 0, gBoxMouth, k12_ColorDarkestGray, gDungeonViewport); dispMan.blitToScreen(dispMan.getBitmap(AL_2_nativeBitmapIndex), 32, 0, 0, gBoxMouth, k12_ColorDarkestGray, g296_DungeonViewport);
AL_2_nativeBitmapIndex = k33_SlotBoxNormalIndice; AL_2_nativeBitmapIndex = k33_SlotBoxNormalIndice;
for (int16 AL_0_statisticIndex = kChampionStatStrength; AL_0_statisticIndex <= kChampionStatAntifire; AL_0_statisticIndex++) { for (int16 AL_0_statisticIndex = kChampionStatStrength; AL_0_statisticIndex <= kChampionStatAntifire; AL_0_statisticIndex++) {
if (champ->getStatistic((ChampionStatisticType)AL_0_statisticIndex, kChampionStatCurrent) if (champ->getStatistic((ChampionStatisticType)AL_0_statisticIndex, kChampionStatCurrent)
@ -811,7 +811,7 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) {
break; break;
} }
} }
dispMan.blitToScreen(dispMan.getBitmap(AL_2_nativeBitmapIndex), 32, 0, 0, gBoxEye, k12_ColorDarkestGray, gDungeonViewport); dispMan.blitToScreen(dispMan.getBitmap(AL_2_nativeBitmapIndex), 32, 0, 0, gBoxEye, k12_ColorDarkestGray, g296_DungeonViewport);
champAttributes |= kChampionAttributeViewport; champAttributes |= kChampionAttributeViewport;
} }
} }
@ -976,7 +976,7 @@ void ChampionMan::drawSlot(uint16 champIndex, ChampionSlot slotIndex) {
if (nativeBitmapIndex != -1) { if (nativeBitmapIndex != -1) {
_vm->_displayMan->_g578_useByteBoxCoordinates = false; _vm->_displayMan->_g578_useByteBoxCoordinates = false;
_vm->_displayMan->blitToScreen(_vm->_displayMan->getBitmap(nativeBitmapIndex), 32, 0, 0, _vm->_displayMan->blitToScreen(_vm->_displayMan->getBitmap(nativeBitmapIndex), 32, 0, 0,
box, k12_ColorDarkestGray, isInventoryChamp ? gDungeonViewport : gDefultViewPort); box, k12_ColorDarkestGray, isInventoryChamp ? g296_DungeonViewport : gDefultViewPort);
} }
_vm->_objectMan->drawIconInSlotBox(slotBoxIndex, iconIndex); _vm->_objectMan->drawIconInSlotBox(slotBoxIndex, iconIndex);
@ -998,8 +998,8 @@ void ChampionMan::renameChampion(Champion* champ) {
box._x1 = 3; box._x1 = 3;
box._x2 = box._x1 + 167; box._x2 = box._x1 + 167;
dispMan.clearScreenBox(k12_ColorDarkestGray, box, gDungeonViewport); dispMan.clearScreenBox(k12_ColorDarkestGray, box, g296_DungeonViewport);
dispMan.blitToScreen(dispMan.getBitmap(k27_PanelRenameChampionIndice), 144, 0, 0, gBoxPanel, k4_ColorCyan, gDungeonViewport); dispMan.blitToScreen(dispMan.getBitmap(k27_PanelRenameChampionIndice), 144, 0, 0, gBoxPanel, k4_ColorCyan, g296_DungeonViewport);
textMan.printToViewport(177, 58, k13_ColorLightestGray, "_______"); textMan.printToViewport(177, 58, k13_ColorLightestGray, "_______");
textMan.printToViewport(105, 76, k13_ColorLightestGray, "___________________"); textMan.printToViewport(105, 76, k13_ColorLightestGray, "___________________");
Common::Point clickPos; Common::Point clickPos;

2
engines/dm/dm.cpp
View file

@ -253,7 +253,7 @@ void DMEngine::gameloop() {
if (!_inventoryMan->_inventoryChampionOrdinal && !_championMan->_partyIsSleeping) { if (!_inventoryMan->_inventoryChampionOrdinal && !_championMan->_partyIsSleeping) {
Box box(0, 224, 0, 126); Box box(0, 224, 0, 126);
_displayMan->clearScreenBox(k0_ColorBlack, box, gDungeonViewport); // dummy code _displayMan->clearScreenBox(k0_ColorBlack, box, g296_DungeonViewport); // dummy code
_displayMan->drawDungeon(_dungeonMan->_currMap._partyDir, _dungeonMan->_currMap._partyPosX, _dungeonMan->_currMap._partyPosY); _displayMan->drawDungeon(_dungeonMan->_currMap._partyDir, _dungeonMan->_currMap._partyPosX, _dungeonMan->_currMap._partyPosY);
} }
// DUMMY CODE: next line // DUMMY CODE: next line

739
engines/dm/gfx.cpp
View file

File diff suppressed because it is too large Load diff

4
engines/dm/gfx.h
View file

@ -399,7 +399,7 @@ public:
}; // @ CREATURE_REPLACEMENT_COLOR_SET }; // @ CREATURE_REPLACEMENT_COLOR_SET
extern Viewport gDefultViewPort; extern Viewport gDefultViewPort;
extern Viewport gDungeonViewport; extern Viewport g296_DungeonViewport;
#define k0_DoorButton 0 // @ C0_DOOR_BUTTON #define k0_DoorButton 0 // @ C0_DOOR_BUTTON
@ -523,7 +523,7 @@ public:
int16 xPos, int16 yPos, int16 destHeight, int16 height2, Viewport &viewport = gDefultViewPort); // @ F0133_VIDEO_BlitBoxFilledWithMaskedBitmap int16 xPos, int16 yPos, int16 destHeight, int16 height2, Viewport &viewport = gDefultViewPort); // @ F0133_VIDEO_BlitBoxFilledWithMaskedBitmap
void blitBoxFilledWithMaskedBitmapToScreen(byte *src, byte *mask, byte *tmp, Box &box, int16 lastUnitIndex, void blitBoxFilledWithMaskedBitmapToScreen(byte *src, byte *mask, byte *tmp, Box &box, int16 lastUnitIndex,
int16 firstUnitIndex, int16 destPixelWidth, Color transparent, int16 firstUnitIndex, int16 destPixelWidth, Color transparent,
int16 xPos, int16 yPos, int16 destHeight, int16 height2, Viewport &viewport = gDungeonViewport); // @ F0133_VIDEO_BlitBoxFilledWithMaskedBitmap int16 xPos, int16 yPos, int16 destHeight, int16 height2, Viewport &viewport = g296_DungeonViewport); // @ F0133_VIDEO_BlitBoxFilledWithMaskedBitmap
void flipBitmapHorizontal(byte *bitmap, uint16 width, uint16 height); void flipBitmapHorizontal(byte *bitmap, uint16 width, uint16 height);
void flipBitmapVertical(byte *bitmap, uint16 width, uint16 height); void flipBitmapVertical(byte *bitmap, uint16 width, uint16 height);

16
engines/dm/inventory.cpp
View file

@ -96,9 +96,9 @@ void InventoryMan::toggleInventory(ChampionIndex championIndex) {
champion = &cm._champions[championIndex]; champion = &cm._champions[championIndex];
int16 w = dm.getWidth(k17_InventoryGraphicIndice); int16 w = dm.getWidth(k17_InventoryGraphicIndice);
int16 h = dm.getHeight(k17_InventoryGraphicIndice); int16 h = dm.getHeight(k17_InventoryGraphicIndice);
dm.blitToScreen(dm.getBitmap(k17_InventoryGraphicIndice), w, 0, 0, 0, w, 0, h, k255_ColorNoTransparency, gDungeonViewport); dm.blitToScreen(dm.getBitmap(k17_InventoryGraphicIndice), w, 0, 0, 0, w, 0, h, k255_ColorNoTransparency, g296_DungeonViewport);
if (cm._candidateChampionOrdinal) { if (cm._candidateChampionOrdinal) {
dm.clearScreenBox(k12_ColorDarkestGray, gBoxFloppyZzzCross, gDungeonViewport); dm.clearScreenBox(k12_ColorDarkestGray, gBoxFloppyZzzCross, g296_DungeonViewport);
} }
_vm->_textMan->printToViewport(5, 116, k13_ColorLightestGray, "HEALTH"); _vm->_textMan->printToViewport(5, 116, k13_ColorLightestGray, "HEALTH");
_vm->_textMan->printToViewport(5, 124, k13_ColorLightestGray, "STAMINA"); _vm->_textMan->printToViewport(5, 124, k13_ColorLightestGray, "STAMINA");
@ -175,7 +175,7 @@ void InventoryMan::drawPanelFoodWaterPoisoned() {
void InventoryMan::drawPanelResurrectReincarnate() { void InventoryMan::drawPanelResurrectReincarnate() {
_panelContent = kPanelContentResurrectReincarnate; _panelContent = kPanelContentResurrectReincarnate;
_vm->_displayMan->blitToScreen(_vm->_displayMan->getBitmap(k40_PanelResurectReincaranteIndice), 144, 0, 0, gBoxPanel, k6_ColorDarkGreen, gDungeonViewport); _vm->_displayMan->blitToScreen(_vm->_displayMan->getBitmap(k40_PanelResurectReincaranteIndice), 144, 0, 0, gBoxPanel, k6_ColorDarkGreen, g296_DungeonViewport);
} }
void InventoryMan::drawPanel() { void InventoryMan::drawPanel() {
@ -258,7 +258,7 @@ void InventoryMan::drawPanelScroll(Scroll* scroll) {
charRed++; charRed++;
} }
*charRed = '\0'; *charRed = '\0';
dispMan.blitToScreen(dispMan.getBitmap(k23_PanelOpenScrollIndice), 144, 0, 0, gBoxPanel, k8_ColorRed, gDungeonViewport); dispMan.blitToScreen(dispMan.getBitmap(k23_PanelOpenScrollIndice), 144, 0, 0, gBoxPanel, k8_ColorRed, g296_DungeonViewport);
int16 lineCount = 1; int16 lineCount = 1;
charRed++; charRed++;
char *charGreen = charRed; // first char of the second line char *charGreen = charRed; // first char of the second line
@ -336,7 +336,7 @@ void InventoryMan::drawIconToViewport(IconIndice iconIndex, int16 xPos, int16 yP
box._x2 = (box._x1 = xPos) + 15 + 1; box._x2 = (box._x1 = xPos) + 15 + 1;
box._y2 = (box._y1 = yPos) + 15 + 1; box._y2 = (box._y1 = yPos) + 15 + 1;
_vm->_objectMan->extractIconFromBitmap(iconIndex, iconBitmap); _vm->_objectMan->extractIconFromBitmap(iconIndex, iconBitmap);
_vm->_displayMan->blitToScreen(iconBitmap, 16, 0, 0, box, k255_ColorNoTransparency, gDungeonViewport); _vm->_displayMan->blitToScreen(iconBitmap, 16, 0, 0, box, k255_ColorNoTransparency, g296_DungeonViewport);
} }
void InventoryMan::buildObjectAttributeString(int16 potentialAttribMask, int16 actualAttribMask, char** attribStrings, char* destString, char* prefixString, char* suffixString) { void InventoryMan::buildObjectAttributeString(int16 potentialAttribMask, int16 actualAttribMask, char** attribStrings, char* destString, char* prefixString, char* suffixString) {
@ -411,7 +411,7 @@ Box gBoxArrowOrEye = Box(83, 98, 57, 65); // @ G0033_s_Graphic562_Box_ArrowOrEye
void InventoryMan::drawPanelArrowOrEye(bool pressingEye) { void InventoryMan::drawPanelArrowOrEye(bool pressingEye) {
DisplayMan &dispMan = *_vm->_displayMan; DisplayMan &dispMan = *_vm->_displayMan;
dispMan.blitToScreen(dispMan.getBitmap(pressingEye ? k19_EyeForObjectDescriptionIndice : k18_ArrowForChestContentIndice), dispMan.blitToScreen(dispMan.getBitmap(pressingEye ? k19_EyeForObjectDescriptionIndice : k18_ArrowForChestContentIndice),
16, 0, 0, gBoxArrowOrEye, k8_ColorRed, gDungeonViewport); 16, 0, 0, gBoxArrowOrEye, k8_ColorRed, g296_DungeonViewport);
} }
@ -443,8 +443,8 @@ void InventoryMan::drawPanelObject(Thing thingToDraw, bool pressingEye) {
openAndDrawChest(thingToDraw, (Container*)rawThingPtr, pressingEye); openAndDrawChest(thingToDraw, (Container*)rawThingPtr, pressingEye);
} else { } else {
IconIndice iconIndex = objMan.getIconIndex(thingToDraw); IconIndice iconIndex = objMan.getIconIndex(thingToDraw);
dispMan.blitToScreen(dispMan.getBitmap(k20_PanelEmptyIndice), 144, 0, 0, gBoxPanel, k8_ColorRed, gDungeonViewport); dispMan.blitToScreen(dispMan.getBitmap(k20_PanelEmptyIndice), 144, 0, 0, gBoxPanel, k8_ColorRed, g296_DungeonViewport);
dispMan.blitToScreen(dispMan.getBitmap(k29_ObjectDescCircleIndice), 32, 0, 0, gBoxObjectDescCircle, k12_ColorDarkestGray, gDungeonViewport); dispMan.blitToScreen(dispMan.getBitmap(k29_ObjectDescCircleIndice), 32, 0, 0, gBoxObjectDescCircle, k12_ColorDarkestGray, g296_DungeonViewport);
char *descString = nullptr; char *descString = nullptr;
char str[40]; char str[40];

2
engines/dm/objectman.cpp
View file

@ -224,7 +224,7 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) {
_vm->_displayMan->_g578_useByteBoxCoordinates = false; _vm->_displayMan->_g578_useByteBoxCoordinates = false;
if (slotBoxIndex >= kSlotBoxInventoryFirstSlot) { if (slotBoxIndex >= kSlotBoxInventoryFirstSlot) {
_vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0,
box, k255_ColorNoTransparency, gDungeonViewport); box, k255_ColorNoTransparency, g296_DungeonViewport);
} else { } else {
_vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0, _vm->_displayMan->blitToScreen(iconsBitmap, 256, (iconIndex & 0x000F) << 4, iconIndex & 0x0FF0,
box, k255_ColorNoTransparency, gDefultViewPort); box, k255_ColorNoTransparency, gDefultViewPort);

2
engines/dm/text.cpp
View file

@ -70,7 +70,7 @@ void TextMan::printTextToScreen(uint16 destX, uint16 destY, Color textColor, Col
} }
void TextMan::printToViewport(int16 posX, int16 posY, Color textColor, const char* text, Color bgColor) { void TextMan::printToViewport(int16 posX, int16 posY, Color textColor, const char* text, Color bgColor) {
printTextToScreen(posX, posY, textColor, bgColor, text, gDungeonViewport); printTextToScreen(posX, posY, textColor, bgColor, text, g296_DungeonViewport);
} }
void TextMan::printWithTrailingSpaces(byte* destBitmap, int16 destPixelWidth, int16 destX, int16 destY, Color textColor, void TextMan::printWithTrailingSpaces(byte* destBitmap, int16 destPixelWidth, int16 destX, int16 destY, Color textColor,