summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-30 16:28:38 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-30 16:29:31 +0300
commit2b8e0b02338400b215b73cec900ffa1fddbac60a (patch)
tree0920d2980bf60aeeb5b9a44140f4537353ced0d9 /src/gui/windows
parentdc8422dbac2c45a082153240138d699c1bfc3b88 (diff)
downloadplus-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.gz
plus-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.bz2
plus-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.xz
plus-2b8e0b02338400b215b73cec900ffa1fddbac60a.zip
Move user defined colors enum into separate file.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/minimap.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 279b3e840..2f73d50e6 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -312,51 +312,51 @@ void Minimap::draw2(Graphics *const graphics)
continue;
int dotSize = 2;
- int type = UserPalette::PC;
+ int type = UserColorId::PC;
if (being == localPlayer)
{
- type = UserPalette::SELF;
+ type = UserColorId::SELF;
dotSize = 3;
}
else if (being->isGM())
{
- type = UserPalette::GM;
+ type = UserColorId::GM;
}
else if (being->getGuild() == localPlayer->getGuild()
|| being->getGuildName() == localPlayer->getGuildName())
{
- type = UserPalette::GUILD;
+ type = UserColorId::GUILD;
}
else
{
switch (being->getType())
{
case ActorType::Monster:
- type = UserPalette::MONSTER;
+ type = UserColorId::MONSTER;
break;
case ActorType::Npc:
- type = UserPalette::NPC;
+ type = UserColorId::NPC;
break;
case ActorType::Portal:
- type = UserPalette::PORTAL_HIGHLIGHT;
+ type = UserColorId::PORTAL_HIGHLIGHT;
break;
case ActorType::LocalPet:
#ifdef EATHENA_SUPPORT
case ActorType::Pet:
#endif
- type = UserPalette::PET;
+ type = UserColorId::PET;
break;
#ifdef EATHENA_SUPPORT
case ActorType::Mercenary:
- type = UserPalette::MERCENARY;
+ type = UserColorId::MERCENARY;
break;
case ActorType::Homunculus:
- type = UserPalette::HOMUNCULUS;
+ type = UserColorId::HOMUNCULUS;
break;
#endif
case ActorType::Avatar:
@@ -407,7 +407,7 @@ void Minimap::draw2(Graphics *const graphics)
if (userPalette)
{
graphics->setColor(userPalette->getColor(
- UserPalette::PARTY));
+ UserColorId::PARTY));
}
const int offsetHeight = static_cast<int>(
@@ -459,7 +459,7 @@ void Minimap::draw2(Graphics *const graphics)
y = a.height - h;
}
- graphics->setColor(userPalette->getColor(UserPalette::PC));
+ graphics->setColor(userPalette->getColor(UserColorId::PC));
graphics->drawRectangle(Rect(x, y, w, h));
graphics->popClipArea();
BLOCK_END("Minimap::draw")