From eed93efa8aa8539b47f225b4abafe6d59bebe67d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 23 Feb 2014 20:17:46 +0300 Subject: Rename drawImage2 methods into drawImage. --- src/gui/windows/equipmentwindow.cpp | 8 ++++---- src/gui/windows/minimap.cpp | 2 +- src/gui/windows/outfitwindow.cpp | 4 ++-- src/gui/windows/skilldialog.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index a50d0e9fa..ea7944f94 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -202,12 +202,12 @@ void EquipmentWindow::draw(Graphics *graphics) continue; if (i == mSelected) { - graphics->drawImage2(mSlotHighlightedBackground, + graphics->drawImage(mSlotHighlightedBackground, box->x, box->y); } else { - graphics->drawImage2(mSlotBackground, box->x, box->y); + graphics->drawImage(mSlotBackground, box->x, box->y); } } } @@ -234,7 +234,7 @@ void EquipmentWindow::draw(Graphics *graphics) { image->setAlpha(1.0F); // Ensure the image is drawn // with maximum opacity - graphics->drawImage2(image, box->x + mItemPadding, + graphics->drawImage(image, box->x + mItemPadding, box->y + mItemPadding); if (i == EQUIP_PROJECTILE_SLOT) { @@ -249,7 +249,7 @@ void EquipmentWindow::draw(Graphics *graphics) } else if (box->image) { - graphics->drawImage2(box->image, + graphics->drawImage(box->image, box->x + mItemPadding, box->y + mItemPadding); } diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index dd8a1d2b7..4c246aed4 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -284,7 +284,7 @@ void Minimap::draw(Graphics *graphics) mMapOriginY = 0; } - graphics->drawImage2(mMapImage, mMapOriginX, mMapOriginY); + graphics->drawImage(mMapImage, mMapOriginX, mMapOriginY); } const ActorSprites &actors = actorManager->getAll(); diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index acf681cf4..0f25b84a6 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -347,7 +347,7 @@ void OutfitWindow::draw(Graphics *graphics) const Image *const image = item->getImage(); if (image) { - graphics->drawImage2(image, itemX, itemY); + graphics->drawImage(image, itemX, itemY); foundItem = true; } } @@ -358,7 +358,7 @@ void OutfitWindow::draw(Graphics *graphics) mItemColors[mCurrentOutfit][i]); if (image) { - graphics->drawImage2(image, itemX, itemY); + graphics->drawImage(image, itemX, itemY); image->decRef(); } } diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index d39d7061b..1346c8e95 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -135,7 +135,7 @@ class SkillListBox final : public ListBox const SkillData *const data = e->data; const int yPad = y + mPadding; const std::string &description = data->description; - graphics->drawImage2(data->icon, mPadding, yPad); + graphics->drawImage(data->icon, mPadding, yPad); font->drawString(graphics, data->name, mTextPadding, yPad); if (!description.empty()) { -- cgit v1.2.3-70-g09d2