1 files changed, 21 insertions, 51 deletions

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 1c549949..430a2aa2 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -26,6 +26,7 @@
 #include <guichan/mouseinput.hpp>
 
 #include "browserbox.h"
+#include "colour.h"
 #include "linkhandler.h"
 
 #ifdef USE_OPENGL
@@ -133,12 +134,12 @@ void BrowserBox::addRow(const std::string &row)
 
             mLinks.push_back(bLink);
 
-            newRow += "##L" + bLink.caption;
+            newRow += "##<" + bLink.caption;
 
             tmp.erase(0, idx3 + 2);
             if(tmp != "")
             {
-                newRow += "##P";
+                newRow += "##>";
             }
             idx1 = tmp.find("@@");
         }
@@ -288,7 +289,8 @@ BrowserBox::draw(gcn::Graphics *graphics)
 
         if ((mHighMode & UNDERLINE))
         {
-            graphics->setColor(gcn::Color(LINK));
+            bool valid;
+            graphics->setColor(gcn::Color(textColour->getColour('<', valid)));
             graphics->drawLine(
                     mLinks[mSelectedLink].x1,
                     mLinks[mSelectedLink].y2,
@@ -315,58 +317,26 @@ BrowserBox::draw(gcn::Graphics *graphics)
             if ( (mUseLinksAndUserColors && (j + 3) <= row.size()) ||
                     (!mUseLinksAndUserColors && (j == 0)) )
             {
-                // Check for color change in format "##x", x = [L,P,0..9]
+                // Check for color change in format "##x"
                 if ((row.at(j) == '#') && (row.at(j + 1) == '#'))
                 {
-                    switch (row.at(j + 2))
+                    char c = row.at(j + 2);
+                    if (c == '>')
                     {
-                        case 'L': // Link color
-                            prevColor = selColor;
-                            selColor = LINK;
-                            break;
-                        case 'P': // Previous color
-                            selColor = prevColor;
-                            break;
-                        case '1':
-                            prevColor = selColor;
-                            selColor = RED;
-                            break;
-                        case '2':
-                            prevColor = selColor;
-                            selColor = GREEN;
-                            break;
-                        case '3':
-                            prevColor = selColor;
-                            selColor = BLUE;
-                            break;
-                        case '4':
-                            prevColor = selColor;
-                            selColor = ORANGE;
-                            break;
-                        case '5':
-                            prevColor = selColor;
-                            selColor = YELLOW;
-                            break;
-                        case '6':
-                            prevColor = selColor;
-                            selColor = PINK;
-                            break;
-                        case '7':
-                            prevColor = selColor;
-                            selColor = PURPLE;
-                            break;
-                        case '8':
-                            prevColor = selColor;
-                            selColor = GRAY;
-                            break;
-                        case '9':
-                            prevColor = selColor;
-                            selColor = BROWN;
-                            break;
-                        case '0':
-                        default:
+                        selColor = prevColor;
+                    }
+                    else
+                    {
+                        bool valid;
+                        int rgb = textColour->getColour(c, valid);
+                        if (c == '<')
+                        {
                             prevColor = selColor;
-                            selColor = BLACK;
+                        }
+                        if (valid)
+                        {
+                            selColor = rgb;
+                        }
                     }
                     j += 3;