summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/being
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadmanaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
manaverse-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/being/being.h10
2 files changed, 4 insertions, 8 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 76af509d3..485b439af 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -542,7 +542,7 @@ void Being::takeDamage(Being *const attacker, const int amount,
// TRANSLATORS: hit or miss message in attacks
const std::string damage = amount ? toString(amount) : type == FLEE ?
_("dodge") : _("miss");
- const gcn::Color *color;
+ const Color *color;
if (gui)
font = gui->getInfoParticleFont();
diff --git a/src/being/being.h b/src/being/being.h
index 4ef40d9fd..e427612f0 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -41,6 +41,7 @@ static const int DEFAULT_BEING_HEIGHT = 32;
class AnimatedSprite;
class BeingCacheEntry;
+class Color;
class Equipment;
class FlashText;
class Guild;
@@ -52,11 +53,6 @@ class Text;
struct ParticleInfo;
-namespace gcn
-{
- class Color;
-}
-
extern volatile int cur_time;
enum Gender
@@ -969,7 +965,7 @@ class Being : public ActorSprite, public ConfigListener
* Holds a text object when the being displays it's name, 0 otherwise
*/
FlashText *mDispName;
- const gcn::Color *mNameColor;
+ const Color *mNameColor;
/** Engine-related infos about weapon. */
const ItemInfo *mEquippedWeapon;
@@ -979,7 +975,7 @@ class Being : public ActorSprite, public ConfigListener
Path mPath;
Text *mText;
- const gcn::Color *mTextColor;
+ const Color *mTextColor;
Vector mDest; /**< destination coordinates. */