Merge branch '0.0.29'

3 files changed, 8 insertions, 11 deletions

diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index 036a25ec..707f4bfa 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -35,8 +35,6 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
-#include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
@@ -61,7 +59,7 @@ EmotePopup::EmotePopup():
     ResourceManager *resman = ResourceManager::getInstance();
     mSelectionImage = resman->getImage("graphics/gui/selection.png");
     if (!mSelectionImage)
-        logger->error(_("Unable to load selection.png"));
+        logger->error("Unable to load selection.png");
 
     mSelectionImage->setAlpha(config.getValue("guialpha", 0.8));
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index e4f0774b..91098074 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -343,7 +343,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
                         mLinks[link].x1 = x;
                         mLinks[link].y1 = y;
                         mLinks[link].x2 = mLinks[link].x1 + size;
-                        mLinks[link].y2 = y + font->getHeight();
+                        mLinks[link].y2 = y + font->getHeight() - 1;
                         link++;
                         prevColor = selColor;
                         selColor = col;
@@ -386,7 +386,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
 
             // Auto wrap mode
             if (mMode == AUTO_WRAP &&
-                    (x + font->getWidth(part.c_str()) + 10) > getWidth())
+                    (x + font->getWidth(part) + 10) > getWidth())
             {
                 bool forced = false;
                 char const *hyphen = "~";
@@ -399,14 +399,14 @@ void BrowserBox::draw(gcn::Graphics *graphics)
                 do
                 {
                     if (!forced)
-                        end = row.rfind(" ", end);
+                        end = row.rfind(' ', end);
 
                     // Check if we have to (stupidly) force-wrap
                     if (end == std::string::npos || end <= start)
                     {
                         forced = true;
                         end = row.size();
-                        x += hyphenWidth * 2; // Account for the wrap-notifier
+                        x += hyphenWidth; // Account for the wrap-notifier
                         continue;
                     }
 
@@ -416,7 +416,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
                     end--; // And then to the last byte of the previous one
 
                     part = row.substr(start, end - start + 1);
-                } while ((x + font->getWidth(part.c_str()) + 10) > getWidth());
+                } while (end > start && (x + font->getWidth(part) + 10) > getWidth());
 
                 if (forced)
                 {
@@ -432,7 +432,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
                 wrappedLines++;
             }
             font->drawString(graphics, part, x, y);
-            x += font->getWidth(part.c_str());
+            x += font->getWidth(part);
         }
         y += font->getHeight();
         setHeight((mTextRows.size() + wrappedLines) * font->getHeight());
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 6a880faa..57fa9fc0 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -23,7 +23,6 @@
 
 #include "log.h"
 
-#include "utils/gettext.h"
 #include "utils/xml.h"
 
 namespace
@@ -50,7 +49,7 @@ void NPCDB::load()
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs"))
     {
-        logger->error(_("NPC Database: Error while loading npcs.xml!"));
+        logger->error("NPC Database: Error while loading npcs.xml!");
     }
 
     //iterate <npc>s