diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 17:14:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 17:14:27 +0300 |
| commit | 2f2b3da534ad7d19afd96cdc92d04052aa63f567 (patch) | |
| tree | c275ba32e0a08e332c16f9d892ca936eac9ce750 /src/resources/map/map.cpp | |
| parent | 10cf17f8d83d2d925641f722acc004828dba3094 (diff) | |
| download | plus-2f2b3da534ad7d19afd96cdc92d04052aa63f567.tar.gz plus-2f2b3da534ad7d19afd96cdc92d04052aa63f567.tar.bz2 plus-2f2b3da534ad7d19afd96cdc92d04052aa63f567.tar.xz plus-2f2b3da534ad7d19afd96cdc92d04052aa63f567.zip | |
Move maptype into separate file.
Diffstat (limited to 'src/resources/map/map.cpp')
| -rw-r--r-- | src/resources/map/map.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 7f856d786..65d1dda3e 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -32,6 +32,7 @@ #include "resources/map/mapheights.h" #include "resources/map/maplayer.h" #include "resources/map/mapitem.h" +#include "resources/map/maptype.h" #include "resources/map/objectslayer.h" #include "resources/map/speciallayer.h" #include "resources/map/tileset.h" @@ -86,7 +87,7 @@ Map::Map(const int width, const int height, mTilesets(), mActors(), mHasWarps(false), - mDebugFlags(MAP_NORMAL), + mDebugFlags(MapType::NORMAL), mOnClosedList(1), mOnOpenList(2), mBackgrounds(), @@ -337,7 +338,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) // Draw backgrounds drawAmbientLayers(graphics, BACKGROUND_LAYERS, mOverlayDetail); - if (mDebugFlags == MAP_BLACKWHITE && userPalette) + if (mDebugFlags == MapType::BLACKWHITE && userPalette) { graphics->setColor(userPalette->getColorWithAlpha( UserPalette::WALKABLE_HIGHLIGHT)); @@ -373,7 +374,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) } #endif - if (mDebugFlags == MAP_SPECIAL3 || mDebugFlags == MAP_BLACKWHITE) + if (mDebugFlags == MapType::SPECIAL3 || mDebugFlags == MapType::BLACKWHITE) { if (mFringeLayer) { @@ -398,7 +399,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) { layer->setSpecialLayer(mSpecialLayer); layer->setTempLayer(mTempLayer); - if (mDebugFlags == MAP_SPECIAL2) + if (mDebugFlags == MapType::SPECIAL2) overFringe = true; layer->drawFringe(graphics, startX, startY, endX, endY, @@ -507,7 +508,7 @@ void Map::drawCollision(Graphics *const graphics, if (endY > mHeight) endY = mHeight; - if (debugFlags < MAP_SPECIAL) + if (debugFlags < MapType::SPECIAL) { graphics->setColor(userPalette->getColorWithAlpha(UserPalette::NET)); graphics->drawNet( |