1 files changed, 51 insertions, 5 deletions

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 96415298..70f82d9d 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui.h"
-
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
@@ -29,6 +27,7 @@
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "focushandler.h"
+#include "gui.h"
 #include "viewport.h"
 #include "window.h"
 #include "windowcontainer.h"
@@ -40,8 +39,8 @@
 
 #include "../resources/image.h"
 #include "../resources/imageset.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/imageloader.h"
+#include "../resources/resourcemanager.h"
 
 // Guichan stuff
 Gui *gui;
@@ -55,6 +54,13 @@ gcn::Font *hitYellowFont;
 // Font used to display speech and player names
 gcn::Font *speechFont;
 
+// Font for displaying NPC names
+gcn::Font *npcNameFont;
+// Font for displaying mob names
+gcn::Font *mobNameFont;
+// Font for displaying GM names
+gcn::Font *gmNameFont;
+
 class GuiConfigListener : public ConfigListener
 {
     public:
@@ -139,14 +145,54 @@ Gui::Gui(Graphics *graphics):
         logger->error("Unable to load rpgfont_wider.png!");
     }
 
+    // Set npc name font
+    try {
+        npcNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-blue.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
+                "αΑιΙνΝσΣϊΪηλ₯£’‘ΏΰγυκρΡφόδΦάΔίψθΘεΕ"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error("Unable to load rpgfont_wider-blue.png!");
+    }
+
+    // Set monster name font
+    try {
+        mobNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-orange.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
+                "αΑιΙνΝσΣϊΪηλ₯£’‘ΏΰγυκρΡφόδΦάΔίψθΘεΕ"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error("Unable to load rpgfont_wider-orange.png!");
+    }
+
+    // Set GM name font
+    try {
+        gmNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-green.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
+                "αΑιΙνΝσΣϊΪηλ₯£’‘ΏΰγυκρΡφόδΦάΔίψθΘεΕ"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error("Unable to load rpgfont_wider-green.png!");
+    }
+
+
     gcn::Widget::setGlobalFont(mGuiFont);
 
     // Load hits' colourful fonts
     try {
         hitRedFont = new gcn::ImageFont("graphics/gui/hits_red.png",
-                "0123456789");
+                "0123456789crit! ");
         hitBlueFont = new gcn::ImageFont("graphics/gui/hits_blue.png",
-                "0123456789");
+                "0123456789crit! ");
         hitYellowFont = new gcn::ImageFont("graphics/gui/hits_yellow.png",
                 "0123456789misxp ");
     }