diff options
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/equipmentwindow.cpp | 12 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 9fe03d1cc..6ea49e607 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -202,13 +202,9 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) if (!box) continue; if (i == mSelected) - { - DRAW_IMAGE(g, mSlotHighlightedBackground, box->x, box->y); - } + g->drawImage2(mSlotHighlightedBackground, box->x, box->y); else - { - DRAW_IMAGE(g, mSlotBackground, box->x, box->y); - } + g->drawImage2(mSlotBackground, box->x, box->y); } } @@ -234,7 +230,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) { image->setAlpha(1.0F); // Ensure the image is drawn // with maximum opacity - DRAW_IMAGE(g, image, box->x + mItemPadding, + g->drawImage2(image, box->x + mItemPadding, box->y + mItemPadding); if (i == EQUIP_PROJECTILE_SLOT) { @@ -248,7 +244,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) } else if (box->image) { - DRAW_IMAGE(g, box->image, box->x + mItemPadding, + g->drawImage2(box->image, box->x + mItemPadding, box->y + mItemPadding); } } diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 6db0b5388..22980f7d9 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -286,7 +286,7 @@ void Minimap::draw(gcn::Graphics *graphics) mMapOriginY = 0; } - DRAW_IMAGE(graph, mMapImage, mMapOriginX, mMapOriginY); + graph->drawImage2(mMapImage, mMapOriginX, mMapOriginY); } const ActorSprites &actors = actorManager->getAll(); diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index c242f5d85..abd3e966a 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -348,7 +348,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics) const Image *const image = item->getImage(); if (image) { - DRAW_IMAGE(g, image, itemX, itemY); + g->drawImage2(image, itemX, itemY); foundItem = true; } } @@ -359,7 +359,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics) mItemColors[mCurrentOutfit][i]); if (image) { - DRAW_IMAGE(g, image, itemX, itemY); + g->drawImage2(image, itemX, itemY); image->decRef(); } } diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index b21f0c09b..f4526475c 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -134,7 +134,7 @@ class SkillListBox final : public ListBox const SkillData *const data = e->data; const int yPad = y + mPadding; const std::string &description = data->description; - DRAW_IMAGE(graphics, data->icon, mPadding, yPad); + graphics->drawImage2(data->icon, mPadding, yPad); font->drawString(graphics, data->name, mTextPadding, yPad); if (!description.empty()) { |