summaryrefslogtreecommitdiff
path: root/src/resources/map/map.cpp
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/resources/map/map.cpp
parentdc8422dbac2c45a082153240138d699c1bfc3b88 (diff)
downloadmv-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.gz
mv-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.bz2
mv-2b8e0b02338400b215b73cec900ffa1fddbac60a.tar.xz
mv-2b8e0b02338400b215b73cec900ffa1fddbac60a.zip
Move user defined colors enum into separate file.
Diffstat (limited to 'src/resources/map/map.cpp')
-rw-r--r--src/resources/map/map.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 111e7c26b..6ccc7b7a4 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -354,7 +354,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
if (mDrawLayersFlags == MapType::BLACKWHITE && userPalette)
{
graphics->setColor(userPalette->getColorWithAlpha(
- UserPalette::WALKABLE_HIGHLIGHT));
+ UserColorId::WALKABLE_HIGHLIGHT));
graphics->fillRectangle(Rect(0, 0,
graphics->mWidth, graphics->mHeight));
@@ -541,7 +541,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
if (width && userPalette)\
{\
graphics->setColor(userPalette->getColorWithAlpha(\
- UserPalette::color));\
+ UserColorId::color));\
graphics->fillRectangle(Rect(\
x0 * mTileWidth - scrollX, \
y * mTileHeight - scrollY, \
@@ -570,7 +570,7 @@ void Map::drawCollision(Graphics *const graphics,
if (drawFlags < MapType::SPECIAL)
{
- graphics->setColor(userPalette->getColorWithAlpha(UserPalette::NET));
+ graphics->setColor(userPalette->getColorWithAlpha(UserColorId::NET));
graphics->drawNet(
startX * mTileWidth - scrollX,
startY * mTileHeight - scrollY,