summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-14 16:59:21 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-14 16:59:21 +0300
commitd9a77eb8ac5d507665cbf8b20f5d8187148ebfd1 (patch)
treedb2f8a25d466ce6aa5ca1747216156f7869a06d1 /src/gui/windows
parent2851324a6847efa7ea6f556941b369e9e304dc23 (diff)
downloadmv-d9a77eb8ac5d507665cbf8b20f5d8187148ebfd1.tar.gz
mv-d9a77eb8ac5d507665cbf8b20f5d8187148ebfd1.tar.bz2
mv-d9a77eb8ac5d507665cbf8b20f5d8187148ebfd1.tar.xz
mv-d9a77eb8ac5d507665cbf8b20f5d8187148ebfd1.zip
Improve a bit separate images drawing.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/equipmentwindow.cpp12
-rw-r--r--src/gui/windows/minimap.cpp2
-rw-r--r--src/gui/windows/outfitwindow.cpp5
-rw-r--r--src/gui/windows/skilldialog.cpp2
4 files changed, 12 insertions, 9 deletions
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 9f1ed11bf..c5df1b528 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -201,9 +201,13 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
if (!box)
continue;
if (i == mSelected)
- g->drawImage(mSlotHighlightedBackground, box->x, box->y);
+ {
+ DRAW_IMAGE(g, mSlotHighlightedBackground, box->x, box->y);
+ }
else
- g->drawImage(mSlotBackground, box->x, box->y);
+ {
+ DRAW_IMAGE(g, mSlotBackground, box->x, box->y);
+ }
}
}
@@ -229,7 +233,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
{
image->setAlpha(1.0F); // Ensure the image is drawn
// with maximum opacity
- g->drawImage(image, box->x + mItemPadding,
+ DRAW_IMAGE(g, image, box->x + mItemPadding,
box->y + mItemPadding);
if (i == EQUIP_PROJECTILE_SLOT)
{
@@ -243,7 +247,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
}
else if (box->image)
{
- g->drawImage(box->image, box->x + mItemPadding,
+ DRAW_IMAGE(g, box->image, box->x + mItemPadding,
box->y + mItemPadding);
}
}
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 7aefa285b..6db0b5388 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;
}
- graph->drawImage(mMapImage, mMapOriginX, mMapOriginY);
+ DRAW_IMAGE(graph, mMapImage, mMapOriginX, mMapOriginY);
}
const ActorSprites &actors = actorManager->getAll();
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 704f3ce60..c242f5d85 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)
{
- g->drawImage(image, itemX, itemY);
+ DRAW_IMAGE(g, image, itemX, itemY);
foundItem = true;
}
}
@@ -359,7 +359,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
mItemColors[mCurrentOutfit][i]);
if (image)
{
- g->drawImage(image, itemX, itemY);
+ DRAW_IMAGE(g, image, itemX, itemY);
image->decRef();
}
}
@@ -367,7 +367,6 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
BLOCK_END("OutfitWindow::draw")
}
-
void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
{
if (event.getButton() == gcn::MouseEvent::LEFT)
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 74fb4faf5..b21f0c09b 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;
- graphics->drawImage(data->icon, mPadding, yPad);
+ DRAW_IMAGE(graphics, data->icon, mPadding, yPad);
font->drawString(graphics, data->name, mTextPadding, yPad);
if (!description.empty())
{