summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-03 18:08:05 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-03 18:08:05 +0300
commit0a9826815fdf65c5c48c1cc78dde8ad43c47c4ac (patch)
tree600aba18b3c90967561ec3ed83f606266a99eff8 /src/resources
parentbcd76117e26e72ed74f9b8c2856a7128e1c27441 (diff)
downloadmv-0a9826815fdf65c5c48c1cc78dde8ad43c47c4ac.tar.gz
mv-0a9826815fdf65c5c48c1cc78dde8ad43c47c4ac.tar.bz2
mv-0a9826815fdf65c5c48c1cc78dde8ad43c47c4ac.tar.xz
mv-0a9826815fdf65c5c48c1cc78dde8ad43c47c4ac.zip
Convert MapType enum into strong typed enum.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.cpp7
-rw-r--r--src/resources/map/map.h8
-rw-r--r--src/resources/map/maplayer.cpp2
-rw-r--r--src/resources/map/maplayer.h4
4 files changed, 11 insertions, 10 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 6ccc7b7a4..7bad7ee3d 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -550,8 +550,9 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
}\
void Map::drawCollision(Graphics *const graphics,
- const int scrollX, const int scrollY,
- const MapType::MapType drawFlags) const
+ const int scrollX,
+ const int scrollY,
+ const MapTypeT drawFlags) const
{
const int endPixelY = graphics->mHeight + scrollY + mTileHeight - 1;
int startX = scrollX / mTileWidth;
@@ -1591,7 +1592,7 @@ void Map::addAnimation(const int gid, TileAnimation *const animation)
mTileAnimations[gid] = animation;
}
-void Map::setDrawLayersFlags(const MapType::MapType &n)
+void Map::setDrawLayersFlags(const MapTypeT &n)
{
mDrawLayersFlags = n;
if (mDrawLayersFlags == MapType::SPECIAL3
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 2cba3de6f..28bf9c4b2 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -116,7 +116,7 @@ class Map final : public Properties, public ConfigListener
*/
void drawCollision(Graphics *const graphics,
const int scrollX, const int scrollY,
- const MapType::MapType drawFlags) const;
+ const MapTypeT drawFlags) const;
/**
* Adds a layer to this map. The map takes ownership of the layer.
@@ -217,9 +217,9 @@ class Map final : public Properties, public ConfigListener
*/
void addAnimation(const int gid, TileAnimation *const animation);
- void setDrawLayersFlags(const MapType::MapType &n);
+ void setDrawLayersFlags(const MapTypeT &n);
- MapType::MapType getDrawLayersFlags() const A_WARN_UNUSED
+ MapTypeT getDrawLayersFlags() const A_WARN_UNUSED
{ return mDrawLayersFlags; }
void addExtraLayer();
@@ -385,7 +385,7 @@ class Map final : public Properties, public ConfigListener
bool mHasWarps;
// draw flags
- MapType::MapType mDrawLayersFlags;
+ MapTypeT mDrawLayersFlags;
// Pathfinding members
unsigned int mOnClosedList;
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index d7aaa8e72..584d5702b 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -664,7 +664,7 @@ int MapLayer::getTileDrawWidth(const Image *img,
return c;
}
-void MapLayer::setDrawLayerFlags(const MapType::MapType &n)
+void MapLayer::setDrawLayerFlags(const MapTypeT &n)
{
mDrawLayerFlags = n;
mSpecialFlag = (mDrawLayerFlags != MapType::SPECIAL
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 9b2617d32..4cf30ade1 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -129,7 +129,7 @@ class MapLayer final: public ConfigListener
void optionChanged(const std::string &value) override final;
- void setDrawLayerFlags(const MapType::MapType &n);
+ void setDrawLayerFlags(const MapTypeT &n);
void setActorsFix(const int y)
{ mActorsFix = y; }
@@ -145,7 +145,7 @@ class MapLayer final: public ConfigListener
const int mWidth;
const int mHeight;
Image **const mTiles;
- MapType::MapType mDrawLayerFlags;
+ MapTypeT mDrawLayerFlags;
const SpecialLayer *mSpecialLayer;
const SpecialLayer *mTempLayer;
typedef std::vector<MapRowVertexes*> MapRows;