Merge branch 'aethyra/master'

Conflicts:
	src/gui/npc_text.cpp
	src/gui/npc_text.h
	src/gui/npcintegerdialog.cpp
	src/gui/npclistdialog.cpp
	src/gui/npcstringdialog.cpp
	src/net/npchandler.cpp
	src/npc.cpp

1 files changed, 5 insertions, 6 deletions

diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index c7ccfe39..0f59371a 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -103,10 +103,7 @@ void ProgressBar::draw(gcn::Graphics *graphics)
 {
     if (config.getValue("guialpha", 0.8) != mAlpha)
     {
-        if (config.getValue("opengl", 0))
-            mAlpha = config.getValue("guialpha", 0.8);
-        else
-            mAlpha = 1.0f;
+        mAlpha = config.getValue("guialpha", 0.8);
         for (int i = 0; i < 9; i++)
         {
             mBorder.grid[i]->setAlpha(mAlpha);
@@ -119,7 +116,8 @@ void ProgressBar::draw(gcn::Graphics *graphics)
     const int alpha = (int)(mAlpha * 255.0f);
 
     // The bar
-    if (mProgress > 0) {
+    if (mProgress > 0)
+    {
 
         graphics->setColor(gcn::Color(mRed, mGreen, mBlue, alpha));
         graphics->fillRectangle(gcn::Rectangle(4, 4,
@@ -128,7 +126,8 @@ void ProgressBar::draw(gcn::Graphics *graphics)
     }
 
     // The label
-    if (!mText.empty()) {
+    if (!mText.empty())
+    {
         gcn::Font *f = boldFont;
         const int textX = getWidth() / 2;
         const int textY = (getHeight() - f->getHeight()) / 2;