Code duplication reduction by Doener, instance counting by me, and a small

improvement to the s character in the font.

3 files changed, 63 insertions, 58 deletions

diff --git a/data/graphics/gui/rpgfont_wider.png b/data/graphics/gui/rpgfont_wider.png
index 081cf5e1..d1a4c80c 100644
--- a/data/graphics/gui/rpgfont_wider.png
+++ b/data/graphics/gui/rpgfont_wider.png
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 25a3da01..34c164d1 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -25,38 +25,56 @@
 #include "../graphics.h"
 #include "../resources/resourcemanager.h"
 
+ImageRect ProgressBar::mBorder;
+int ProgressBar::mInstances = 0;
+
 ProgressBar::ProgressBar(float progress, int x, int y, int width, int height,
         int red, int green, int blue):
     gcn::Widget(),
-    red(red), green(green), blue(blue)
+    red(red), green(green), blue(blue),
+    redToGo(red), greenToGo(green), blueToGo(blue)
 {
     setProgress(progress);
     setX(x);
     setY(y);
     setWidth(width);
     setHeight(height);
-    redToGo = red;
-    greenToGo = green;
-    blueToGo = blue;
-
-    // Load dialog title bar image
-    ResourceManager *resman = ResourceManager::getInstance();
-    Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
-    dBackground = resman->getImage("graphics/gui/bg_quad_dis.png");
-
-    dTopBorder = dBorders->getSubImage(4, 0, 3, 4);
-    dLeftBorder = dBorders->getSubImage(0, 4, 4, 10);
-    dRightBorder = dBorders->getSubImage(7, 4, 4, 10);
-    dBottomBorder = dBorders->getSubImage(4, 15, 3, 4);
-
-    dTopLeftBorder = dBorders->getSubImage(0, 0, 4, 4);
-    dTopRightBorder = dBorders->getSubImage(7, 0, 4, 4);
-    dBottomRightBorder = dBorders->getSubImage(7, 15, 4, 4);
-    dBottomLeftBorder = dBorders->getSubImage(0, 15, 4, 4);
+
+    if (mInstances == 0)
+    {
+        ResourceManager *resman = ResourceManager::getInstance();
+        Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
+        mBorder.grid[0] = dBorders->getSubImage(0, 0, 4, 4);
+        mBorder.grid[1] = dBorders->getSubImage(4, 0, 3, 4);
+        mBorder.grid[2] = dBorders->getSubImage(7, 0, 4, 4);
+        mBorder.grid[3] = dBorders->getSubImage(0, 4, 4, 10);
+        mBorder.grid[4] = resman->getImage("graphics/gui/bg_quad_dis.png");
+        mBorder.grid[5] = dBorders->getSubImage(7, 4, 4, 10);
+        mBorder.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
+        mBorder.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
+        mBorder.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
+        dBorders->decRef();
+    }
+
+    mInstances++;
 }
 
 ProgressBar::~ProgressBar()
 {
+    mInstances--;
+
+    if (mInstances == 0)
+    {
+        delete mBorder.grid[0];
+        delete mBorder.grid[1];
+        delete mBorder.grid[2];
+        delete mBorder.grid[3];
+        mBorder.grid[4]->decRef();
+        delete mBorder.grid[5];
+        delete mBorder.grid[6];
+        delete mBorder.grid[7];
+        delete mBorder.grid[8];
+    }
 }
 
 void ProgressBar::logic()
@@ -72,28 +90,11 @@ void ProgressBar::logic()
 
 void ProgressBar::draw(gcn::Graphics *graphics)
 {
-    int absx, absy;
-    getAbsolutePosition(absx, absy);
-
-    // Background
-    dBackground->drawPattern(screen,
-            absx + 4, absy + 4,
-            getWidth() - 8, getHeight() - 8);
-
-    // The corners
-    dTopLeftBorder->draw(screen, absx, absy);
-    dTopRightBorder->draw(screen, absx + getWidth() - 4, absy);
-    dBottomLeftBorder->draw(screen, absx, absy + getHeight() - 4);
-    dBottomRightBorder->draw(screen,
-            absx+getWidth() - 4, absy+getHeight() - 4);
-
-    // The borders
-    dTopBorder->drawPattern(screen, absx + 4, absy, getWidth() - 8, 4);
-    dBottomBorder->drawPattern(screen, absx + 4, absy + getHeight() - 4,
-            getWidth() - 8, 4);
-    dLeftBorder->drawPattern(screen, absx, absy + 4, 4, getHeight() - 8);
-    dRightBorder->drawPattern(screen, absx + getWidth() - 4, absy + 4,
-            4, getHeight() - 8);
+    int x, y;
+    getAbsolutePosition(x, y);
+
+    ((Graphics*)graphics)->drawImageRect(x, y, getWidth(), getHeight(),
+                                         mBorder);
 
     // The bar
     if (progress > 0)
@@ -122,3 +123,18 @@ void ProgressBar::setColor(int red, int green, int blue)
     this->greenToGo = green;
     this->blueToGo = blue;
 }
+
+unsigned char ProgressBar::getRed()
+{
+    return red;
+}
+
+unsigned char ProgressBar::getGreen()
+{
+    return green;
+}
+
+unsigned char ProgressBar::getBlue()
+{
+    return blue;
+}
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index 3e751459..9568de9d 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -25,6 +25,7 @@
 #define _TMW_PROGRESSBAR_H
 
 #include <guichan.hpp>
+#include "../graphics.h"
 #include "../resources/image.h"
 
 /**
@@ -74,37 +75,25 @@ class ProgressBar : public gcn::Widget {
         /**
          * Get The red value of color
          */
-        unsigned char getRed()
-        {
-            return red;
-        }
+        unsigned char getRed();
 
          /**
          * Get The red value of color
          */
-        unsigned char getGreen()
-        {
-            return green;
-        }
+        unsigned char getGreen();
 
          /**
          * Get The red value of color
          */
-        unsigned char getBlue()
-        {
-            return blue;
-        }
+        unsigned char getBlue();
 
     private:
         float progress;
         int red, green, blue;
         int redToGo, greenToGo, blueToGo;
 
-        // Bar Images
-        Image *dBackground;
-        Image *dTopLeftBorder, *dTopRightBorder, *dBottomLeftBorder;
-        Image *dBottomRightBorder;
-        Image *dLeftBorder, *dRightBorder, *dTopBorder, *dBottomBorder;
+        static ImageRect mBorder;
+        static int mInstances;
 };
 
 #endif