- Commenting out buddy and new skills windows

- Some code cleaning
- Workaround for colored text not being displayed in SDL mode (disabled)

2 files changed, 7 insertions, 6 deletions

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 35b3c843..ec9a6adc 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -91,8 +91,10 @@ Gui::Gui(Graphics *graphics)
     {
         logger->error("Unable to load fixedfont.png!");
     }
+    
+    gcn::Widget::setGlobalFont(guiFont);
 
-    // Set hits' colourful fonts
+    // Load hits' colourful fonts
     try {
         hitRedFont = new gcn::ImageFont(
                 TMW_DATADIR "data/graphics/gui/hits_red.png",
@@ -108,8 +110,6 @@ Gui::Gui(Graphics *graphics)
     {
         logger->error("Unable to load colored hits' fonts!");
     }
-
-    gcn::Widget::setGlobalFont(guiFont);
 }
 
 Gui::~Gui()
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 76b8e4e2..f58312db 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -91,7 +91,7 @@ void PopupMenu::showPopup(int mx, int my)
             //browserBox->addRow("@@attack|Attack " + name + "@@");
             browserBox->addRow("@@trade|Trade With " + name + "@@");
             browserBox->addRow("@@follow|Follow " + name + "@@");
-            browserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
+            //browserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
         }
     }
     else if (floorItem)
@@ -172,7 +172,8 @@ void PopupMenu::handleLink(const std::string& link)
     else if (link == "follow")
     {
     }
-
+    
+    /*
     // Add Buddy action
     else if ((link == "buddy") && being && being->isPlayer())
     {
@@ -180,7 +181,7 @@ void PopupMenu::handleLink(const std::string& link)
             buddyWindow->setVisible(true);
 
         buddyWindow->addBuddy(being->name);
-    }
+    }*/
 
     // Pick Up Floor Item action
     else if ((link == "pickup") && floorItem)