summaryrefslogtreecommitdiff
path: root/src/gui/windows/equipmentwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/windows/equipmentwindow.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadmanaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/gui/windows/equipmentwindow.cpp')
-rw-r--r--src/gui/windows/equipmentwindow.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 5caf30df1..6f2bb3b3d 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -32,6 +32,7 @@
#include "being/localplayer.h"
#include "being/playerinfo.h"
+#include "gui/font.h"
#include "gui/viewport.h"
#include "gui/popups/itempopup.h"
@@ -46,8 +47,6 @@
#include "utils/dtor.h"
#include "utils/gettext.h"
-#include "gui/base/font.hpp"
-
#include "debug.h"
static const int BOX_COUNT = 13;
@@ -163,7 +162,7 @@ void EquipmentWindow::draw(Graphics *graphics)
Window::draw(graphics);
int i = 0;
- gcn::Font *const font = getFont();
+ Font *const font = getFont();
const int fontHeight = font->getHeight();
if (isBatchDrawRenders(openGLMode))