summaryrefslogtreecommitdiff
path: root/src/being/being.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/being/being.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadmv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 8b2ece2b7..1fcccb0cf 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -39,7 +39,7 @@
#include "particle/particle.h"
#include "particle/particleinfo.h"
-#include "gui/sdlfont.h"
+#include "gui/font.h"
#include "gui/popups/speechbubble.h"
@@ -537,7 +537,7 @@ void Being::takeDamage(Being *const attacker, const int amount,
if (!userPalette || !attacker)
return;
- gcn::Font *font = nullptr;
+ Font *font = nullptr;
// TRANSLATORS: hit or miss message in attacks
const std::string damage = amount ? toString(amount) : type == FLEE ?
_("dodge") : _("miss");
@@ -2003,7 +2003,7 @@ void Being::showName()
displayName.append(", ").append(toString(getDamageTaken()));
}
- gcn::Font *font = nullptr;
+ Font *font = nullptr;
if (player_node && player_node->getTarget() == this
&& mType != MONSTER)
{
@@ -2519,7 +2519,7 @@ void Being::drawSpriteAt(Graphics *const graphics,
if (mDrawHotKeys && !mName.empty())
{
- gcn::Font *const font = gui->getFont();
+ Font *const font = gui->getFont();
if (font)
{
graphics->setColor(userPalette->getColor(UserPalette::BEING));