diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 15:04:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 15:08:24 +0300 |
| commit | 07121956f882dce22235868a25e0c2df96fb828a (patch) | |
| tree | 5078133e95d7b55c4811e09c9dc4f53261e62fe9 /src/being | |
| parent | f57b683f8f9909ba7787c33a4953869a2ce04a5c (diff) | |
| download | mv-07121956f882dce22235868a25e0c2df96fb828a.tar.gz mv-07121956f882dce22235868a25e0c2df96fb828a.tar.bz2 mv-07121956f882dce22235868a25e0c2df96fb828a.tar.xz mv-07121956f882dce22235868a25e0c2df96fb828a.zip | |
Move theme colors enum into separate file.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 6 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 95d7330ed..121564ccc 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1882,7 +1882,7 @@ void Being::drawSpeech(const int offsetX, const int offsetY) getPixelX(), getPixelY() - getHeight(), Graphics::CENTER, - &theme->getColor(Theme::BUBBLE_TEXT, 255), + &theme->getColor(ThemeColorId::BUBBLE_TEXT, 255), Speech_true); } } @@ -2073,11 +2073,11 @@ void Being::updateColors() else if (this == localPlayer) { mNameColor = &userPalette->getColor(UserPalette::SELF); - mTextColor = &theme->getColor(Theme::PLAYER, 255); + mTextColor = &theme->getColor(ThemeColorId::PLAYER, 255); } else { - mTextColor = &theme->getColor(Theme::PLAYER, 255); + mTextColor = &theme->getColor(ThemeColorId::PLAYER, 255); if (player_relations.getRelation(mName) != PlayerRelation::ERASED) mErased = false; diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index e9fa6e2c4..6251cc5e5 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -183,7 +183,7 @@ LocalPlayer::LocalPlayer(const BeingId id, mAttackRange = 0; mLevel = 1; mAdvanced = true; - mTextColor = &theme->getColor(Theme::PLAYER, 255); + mTextColor = &theme->getColor(ThemeColorId::PLAYER, 255); if (userPalette) mNameColor = &userPalette->getColor(UserPalette::SELF); else |