Only load resources once for player box, scroll area and text field. Also

tweaked the look a little, needs to be checked for opaque problem.

1 files changed, 35 insertions, 13 deletions

diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index b97b37b3..9514d335 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -27,6 +27,9 @@
 #include "../main.h"
 #include "../resources/resourcemanager.h"
 
+int PlayerBox::instances = 0;
+ImageRect PlayerBox::background;
+
 PlayerBox::PlayerBox():
     hairColor(0),
     hairStyle(0),
@@ -34,20 +37,39 @@ PlayerBox::PlayerBox():
 {
     setBorderSize(2);
 
-    // Load the background skin
-    ResourceManager *resman = ResourceManager::getInstance();
-    Image *textbox = resman->getImage("graphics/gui/textbox.png");
-    int bggridx[4] = {0, 9, 16, 25};
-    int bggridy[4] = {0, 4, 19, 24};
-    int a = 0, x, y;
+    if (instances == 0)
+    {
+        // Load the background skin
+        ResourceManager *resman = ResourceManager::getInstance();
+        Image *textbox = resman->getImage("graphics/gui/deepbox.png");
+        int bggridx[4] = {0, 3, 28, 31};
+        int bggridy[4] = {0, 3, 28, 31};
+        int a = 0, x, y;
+
+        for (y = 0; y < 3; y++) {
+            for (x = 0; x < 3; x++) {
+                background.grid[a] = textbox->getSubImage(
+                        bggridx[x], bggridy[y],
+                        bggridx[x + 1] - bggridx[x] + 1,
+                        bggridy[y + 1] - bggridy[y] + 1);
+                a++;
+            }
+        }
+
+        textbox->decRef();
+    }
+
+    instances++;
+}
 
-    for (y = 0; y < 3; y++) {
-        for (x = 0; x < 3; x++) {
-            background.grid[a] = textbox->getSubImage(
-                    bggridx[x], bggridy[y],
-                    bggridx[x + 1] - bggridx[x] + 1,
-                    bggridy[y + 1] - bggridy[y] + 1);
-            a++;
+PlayerBox::~PlayerBox()
+{
+    instances--;
+
+    if (instances == 0)
+    {
+        for (int a = 0; a < 9; a++) {
+            delete background.grid[a];
         }
     }
 }