From aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2015 15:18:19 +0300 Subject: Move theme progress colors enum into separate file. --- src/gui/widgets/avatarlistbox.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/avatarlistbox.cpp') diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index b2ee21937..5c2f0a65d 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -25,6 +25,8 @@ #include "configuration.h" #include "graphicsvertexes.h" +#include "enums/gui/progresscolorid.h" + #include "being/localplayer.h" #include "gui/gui.h" @@ -178,7 +180,7 @@ void AvatarListBox::draw(Graphics *graphics) if (a->getMaxHp()) { const int themeColor = (isPoison - ? Theme::PROG_HP_POISON : Theme::PROG_HP); + ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor( themeColor, static_cast(a->getHp()) / static_cast(a->getMaxHp())); @@ -203,7 +205,7 @@ void AvatarListBox::draw(Graphics *graphics) } const int themeColor = (a->getPoison() - ? Theme::PROG_HP_POISON : Theme::PROG_HP); + ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor(themeColor, 1); color.a = 80; graphics->setColor(color); @@ -415,7 +417,7 @@ void AvatarListBox::safeDraw(Graphics *graphics) if (a->getMaxHp()) { const int themeColor = (isPoison - ? Theme::PROG_HP_POISON : Theme::PROG_HP); + ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor( themeColor, static_cast(a->getHp()) / static_cast(a->getMaxHp())); @@ -440,7 +442,7 @@ void AvatarListBox::safeDraw(Graphics *graphics) } const int themeColor = (a->getPoison() - ? Theme::PROG_HP_POISON : Theme::PROG_HP); + ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor(themeColor, 1); color.a = 80; graphics->setColor(color); -- cgit v1.2.3-70-g09d2