Fixed some glitches in Equipment and Inventory window, and made the code more logical...

Now, the setAlpha() function is called with less changing numbers
which can help increasing FPS a bit...

3 files changed, 5 insertions, 2 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 2fd7ccad..9944fa39 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -136,6 +136,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         {
             // Draw Item.
             Image *image = item->getImage();
+            image->setAlpha(1.0f); // Ensure the image is drawn with maximum opacity
             g->drawImage(image,
                          mEquipBox[i].posX + 2,
                          mEquipBox[i].posY + 2);
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index d8ae6e20..c8d3ca7d 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -126,10 +126,11 @@ void ItemContainer::draw(gcn::Graphics *graphics)
                         itemY = mDragPosY - (BOX_HEIGHT / 2);
                     }
                     else {
-                        // Draw selected image.
+                        // Draw selection border image.
                         g->drawImage(mSelImg, itemX, itemY);
                     }
                 }
+                image->setAlpha(1.0f); // ensure the image if fully drawn...
                 g->drawImage(image, itemX, itemY);
             }
             // Draw item caption
diff --git a/src/map.cpp b/src/map.cpp
index 1a869e61..2176327f 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -145,6 +145,7 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY,
         {
             while (si != sprites.end() && (*si)->getPixelY() <= y * 32)
             {
+                (*si)->setAlpha(1.0f);
                 (*si)->draw(graphics, -scrollX, -scrollY);
                 si++;
             }
@@ -167,6 +168,7 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY,
     {
         while (si != sprites.end())
         {
+            (*si)->setAlpha(1.0f);
             (*si)->draw(graphics, -scrollX, -scrollY);
             si++;
         }
@@ -297,7 +299,6 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
             {
                 (*si)->setAlpha(0.3f);
                 (*si)->draw(graphics, -scrollX, -scrollY);
-                (*si)->setAlpha(1.0f);
             }
         }
         si++;