- Adding the wonderful new font by Bjorn to speech and player names

- Way to system cursor (now you can choose the original sdl cursor in config)

2 files changed, 29 insertions, 0 deletions

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 7643c01f..81e6c5df 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -43,6 +43,8 @@ WindowContainer *guiTop;               // The top container
 gcn::ImageFont *hitRedFont;
 gcn::ImageFont *hitBlueFont;
 gcn::ImageFont *hitYellowFont;
+// Font used to display speech and player names
+gcn::ImageFont *speechFont;
 
 Gui::Gui(Graphics *graphics)
 {
@@ -104,6 +106,29 @@ Gui::Gui(Graphics *graphics)
             logger->error("Unable to load sansserif8.png!");
         }
     }
+    
+    // Set speech font
+    try {
+        speechFont = new gcn::ImageFont(
+                TMW_DATADIR "data/graphics/gui/rpgfont_wider.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@&\\"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        try {
+            guiFont = new gcn::ImageFont(
+                    "data/graphics/gui/rpgfont_wider.png",
+                    " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                    "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@&\\"
+                    );
+        }
+        catch (gcn::Exception e)
+        {
+            logger->error("Unable to load rpgfont_wider.png!");
+        }
+    }
 
     gcn::Widget::setGlobalFont(guiFont);
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 42334ca1..dfd72ec7 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -95,5 +95,9 @@ extern gcn::SDLInput *guiInput;               /**< GUI input */
 extern gcn::ImageFont *hitRedFont;
 extern gcn::ImageFont *hitBlueFont;
 extern gcn::ImageFont *hitYellowFont;
+/**
+ * Font used to display speech and player names
+ */
+extern gcn::ImageFont *speechFont;
 
 #endif