From d7c67fa2b6faa3e81269244224da4b72f045d659 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 31 May 2015 14:23:11 +0300 Subject: Convert ProgressColorId enum into strong typed enum. --- src/gui/widgets/avatarlistbox.cpp | 8 ++++---- 1 file changed, 4 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 5c2f0a65d..d5b6cbaf8 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -179,7 +179,7 @@ void AvatarListBox::draw(Graphics *graphics) const bool isPoison = a->getPoison(); if (a->getMaxHp()) { - const int themeColor = (isPoison + const ProgressColorIdT themeColor = (isPoison ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor( themeColor, static_cast(a->getHp()) @@ -204,7 +204,7 @@ void AvatarListBox::draw(Graphics *graphics) a->getDamageHp()); } - const int themeColor = (a->getPoison() + const ProgressColorIdT themeColor = (a->getPoison() ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor(themeColor, 1); color.a = 80; @@ -416,7 +416,7 @@ void AvatarListBox::safeDraw(Graphics *graphics) const bool isPoison = a->getPoison(); if (a->getMaxHp()) { - const int themeColor = (isPoison + const ProgressColorIdT themeColor = (isPoison ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor( themeColor, static_cast(a->getHp()) @@ -441,7 +441,7 @@ void AvatarListBox::safeDraw(Graphics *graphics) a->getDamageHp()); } - const int themeColor = (a->getPoison() + const ProgressColorIdT themeColor = (a->getPoison() ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP); Color color = Theme::getProgressColor(themeColor, 1); color.a = 80; -- cgit v1.2.3-60-g2f50