diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-09-10 07:46:51 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-05 22:13:17 -0700 |
| commit | 12c742f538bd24b8d25b4fe971c7eef507c3b4c9 (patch) | |
| tree | 3462c60129cb51dec11a2fcf49afd532dcdaf064 /src/gui/gui.cpp | |
| parent | cb7292a77b421e943518edd64b9f11a256b0a691 (diff) | |
| download | mana-12c742f538bd24b8d25b4fe971c7eef507c3b4c9.tar.gz mana-12c742f538bd24b8d25b4fe971c7eef507c3b4c9.tar.bz2 mana-12c742f538bd24b8d25b4fe971c7eef507c3b4c9.tar.xz mana-12c742f538bd24b8d25b4fe971c7eef507c3b4c9.zip | |
Modified the Aethyra client to use the TMW TrueType class, rather than
the inbuilt GUIChan TrueType class. (Didn't use it originally because I
didn't see the difference, when there's a considerable speedup, and that
originally the import for TMW was broken code at the time, which has
been fixed since.)
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 846a0f44..f33d9495 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -22,12 +22,14 @@ #include <guichan/exception.hpp> #include <guichan/image.hpp> #include <guichan/imagefont.hpp> +#include <SDL/SDL_ttf.h> // Should stay here because of Guichan being sensitive to headers order #include <guichan/sdl/sdlinput.hpp> #include "focushandler.h" #include "gui.h" +#include "truetypefont.h" #include "viewport.h" #include "window.h" #include "windowcontainer.h" @@ -36,7 +38,6 @@ #include "../configuration.h" #include "../graphics.h" #include "../log.h" -#include "../sdltruetypefont.hpp" #include "../resources/image.h" #include "../resources/imageset.h" @@ -113,12 +114,12 @@ Gui::Gui(Graphics *graphics): // Set global font try { - mGuiFont = new gcn::contrib::SDLTrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10); + mGuiFont = new TrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10); } catch (gcn::Exception e) { try { - mGuiFont = new gcn::contrib::SDLTrueTypeFont("data/fonts/dejavusans.ttf", 10); + mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 10); } catch (gcn::Exception e) { |