diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 16:28:38 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 16:29:31 +0300 |
commit | 2b8e0b02338400b215b73cec900ffa1fddbac60a (patch) | |
tree | 0920d2980bf60aeeb5b9a44140f4537353ced0d9 /src/being/localplayer.cpp | |
parent | dc8422dbac2c45a082153240138d699c1bfc3b88 (diff) | |
download | manaverse-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.gz manaverse-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.bz2 manaverse-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.xz manaverse-2b8e0b02338400b215b73cec900ffa1fddbac60a.zip |
Move user defined colors enum into separate file.
Diffstat (limited to 'src/being/localplayer.cpp')
-rw-r--r-- | src/being/localplayer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 6251cc5e5..5c47c55a8 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -185,7 +185,7 @@ LocalPlayer::LocalPlayer(const BeingId id, mAdvanced = true; mTextColor = &theme->getColor(ThemeColorId::PLAYER, 255); if (userPalette) - mNameColor = &userPalette->getColor(UserPalette::SELF); + mNameColor = &userPalette->getColor(UserColorId::SELF); else mNameColor = nullptr; @@ -881,7 +881,7 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, if (mMap && config.getBoolValue("showpickupparticle")) { // Show pickup notification - addMessageToQueue(gettext(msg), UserPalette::PICKUP_INFO); + addMessageToQueue(gettext(msg), UserColorId::PICKUP_INFO); } } else @@ -908,11 +908,11 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, if (amount > 1) { addMessageToQueue(strprintf("%d x %s", amount, - str.c_str()), UserPalette::PICKUP_INFO); + str.c_str()), UserColorId::PICKUP_INFO); } else { - addMessageToQueue(str, UserPalette::PICKUP_INFO); + addMessageToQueue(str, UserColorId::PICKUP_INFO); } } } |