Major rendering performance increase in software mode, by not using RLE

compression on loaded images while most of the time, we're only drawing a small
subimage of them. Also, don't try to draw an icon when it is not defined or
failed to load properly.

2 files changed, 7 insertions, 3 deletions

diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index f5581323..4821067c 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -89,7 +89,11 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
 
         if (mShopItems)
         {
-            graphics->drawImage(mShopItems->at(i).image, 1, y);
+            Image *icon = mShopItems->at(i).image;
+            if (icon)
+            {
+                graphics->drawImage(icon, 1, y);
+            }
         }
         graphics->drawText(mListModel->getElementAt(i), ITEM_ICON_SIZE + 5,
                 y + (ITEM_ICON_SIZE - getFont()->getHeight()) / 2);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index eabb717c..2c69143f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -199,8 +199,8 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     }
 
     // Draw target marker if needed
-    Being *target;
-    if ((target = player_node->getTarget()))
+    Being *target = player_node->getTarget();
+    if (target)
     {
         graphics->setFont(speechFont);
         graphics->setColor(gcn::Color(255, 32, 32));