Changed around recent additions to Image class a bit and fixed OpenGL compile.

1 files changed, 23 insertions, 13 deletions

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 278f36c3..34b49571 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -31,10 +31,11 @@ ChatBox::ChatBox(const char *logfile, int item_num)
     items = 0;
     items_keep = item_num;
     
-    chatBoxBackground = new Image();
-    chatBoxBackground->create(200, 200);
-    chatBoxBackground->fillWithColor(255, 255, 255);
-    chatBoxBackground->setAlpha(0.7f);
+    chatBoxBackground = Image::create(200, 200);
+    if (chatBoxBackground) {
+        chatBoxBackground->fillWithColor(255, 255, 255);
+        chatBoxBackground->setAlpha(0.7f);
+    }
 }
 
 ChatBox::~ChatBox()
@@ -128,16 +129,25 @@ void ChatBox::draw(gcn::Graphics *graphics)
     graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
 
     getAbsolutePosition(x, y);
-    
-    if ( (chatBoxBackground->getWidth() != getWidth()) || (chatBoxBackground->getHeight() != getHeight()) )
-    {
-        chatBoxBackground->unload();
-        chatBoxBackground->create(getWidth(), getHeight());
-        chatBoxBackground->fillWithColor(255, 255, 255); 
-        chatBoxBackground->setAlpha(0.7f);
+
+    // Potentially recreate background with new size
+    if (chatBoxBackground) {
+        if ((chatBoxBackground->getWidth() != getWidth()) ||
+                (chatBoxBackground->getHeight() != getHeight()))
+        {
+            delete chatBoxBackground;
+            chatBoxBackground = Image::create(getWidth(), getHeight());
+            if (chatBoxBackground) {
+                chatBoxBackground->fillWithColor(255, 255, 255); 
+                chatBoxBackground->setAlpha(0.7f);
+            }
+        }
+    }
+
+    // Draw background image
+    if (chatBoxBackground) {
+        chatBoxBackground->draw(screen, x, y);
     }
-    
-    chatBoxBackground->draw(screen, x, y);
 
     for (iter = chatlog.begin(); iter != chatlog.end(); iter++) {
         line = *iter;