summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-16 15:41:51 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-16 15:41:51 +0300
commit1b75e974088a94cd28d7a48729545904b2cd908b (patch)
treed771752fd0da4c58c8ff2d941c47274ead984e42 /src/being
parent46087564d4184b28740b0c45c1bac199ab1942ec (diff)
downloadmv-1b75e974088a94cd28d7a48729545904b2cd908b.tar.gz
mv-1b75e974088a94cd28d7a48729545904b2cd908b.tar.bz2
mv-1b75e974088a94cd28d7a48729545904b2cd908b.tar.xz
mv-1b75e974088a94cd28d7a48729545904b2cd908b.zip
Remove some useless static methods from theme.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp8
-rw-r--r--src/being/localplayer.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 41c3bc40c..611263dff 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -1710,8 +1710,8 @@ void Being::drawSpeech(const int offsetX, const int offsetY)
if (!mText && userPalette)
{
mText = new Text(mSpeech, getPixelX(), getPixelY() - getHeight(),
- Graphics::CENTER, &Theme::getThemeColor(
- Theme::BUBBLE_TEXT), true);
+ Graphics::CENTER, &theme->getColor(
+ Theme::BUBBLE_TEXT, 255), true);
}
}
else if (speech == NO_SPEECH)
@@ -1901,11 +1901,11 @@ void Being::updateColors()
else if (this == player_node)
{
mNameColor = &userPalette->getColor(UserPalette::SELF);
- mTextColor = &Theme::getThemeColor(Theme::PLAYER);
+ mTextColor = &theme->getColor(Theme::PLAYER, 255);
}
else
{
- mTextColor = &Theme::getThemeColor(Theme::PLAYER);
+ mTextColor = &theme->getColor(Theme::PLAYER, 255);
if (player_relations.getRelation(mName) != PlayerRelation::ERASED)
mErased = false;
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 889f2b906..55e7baca9 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -178,7 +178,7 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
mAttackRange = 0;
mLevel = 1;
mAdvanced = true;
- mTextColor = &Theme::getThemeColor(Theme::PLAYER);
+ mTextColor = &theme->getColor(Theme::PLAYER, 255);
if (userPalette)
mNameColor = &userPalette->getColor(UserPalette::SELF);
else