diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-03-09 07:31:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-03-09 07:32:10 +0300 |
| commit | b624b0a4d6410134072c894d5686335c588a6c99 (patch) | |
| tree | 655dda6e0f4ed4ac772a6150f8d3cd2a6ebaec9b /src/resources/map/map.h | |
| parent | b406b1a7717af8fd479d39133df35fb331880b61 (diff) | |
| download | mv-b624b0a4d6410134072c894d5686335c588a6c99.tar.gz mv-b624b0a4d6410134072c894d5686335c588a6c99.tar.bz2 mv-b624b0a4d6410134072c894d5686335c588a6c99.tar.xz mv-b624b0a4d6410134072c894d5686335c588a6c99.zip | |
Fix compilation without OpenGL.
Diffstat (limited to 'src/resources/map/map.h')
| -rw-r--r-- | src/resources/map/map.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index a3397ad2e..bcfd9e12e 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -42,7 +42,10 @@ #include "resources/map/properties.h" class AmbientLayer; +#ifdef USE_OPENGL class AtlasResource; +#endif // USE_OPENGL + class MapHeights; class MapItem; class MapLayer; @@ -284,8 +287,6 @@ class Map final : public Properties, int getActorsCount() const restrict2 A_WARN_UNUSED { return CAST_S32(mActors.size()); } - int getAtlasCount() const restrict2 A_WARN_UNUSED; - void setPvpMode(const int mode) restrict2; int getPvpMode() const restrict2 noexcept2 A_WARN_UNUSED @@ -330,9 +331,16 @@ class Map final : public Properties, restrict2 noexcept2 A_WARN_UNUSED { return mTileAnimations; } +#ifdef USE_OPENGL + int getAtlasCount() const restrict2 A_WARN_UNUSED; + void setAtlas(AtlasResource *restrict const atlas) restrict2 noexcept2 { mAtlas = atlas; } + bool haveAtlas() const + { return mAtlas != nullptr; } +#endif // USE_OPENGL + const MetaTile *getMetaTiles() const restrict2 noexcept2 { return mMetaTiles; } @@ -365,9 +373,6 @@ class Map final : public Properties, std::string getCounterName() const override final { return mName; } - bool haveAtlas() const - { return mAtlas != nullptr; } - protected: friend class Actor; friend class Minimap; @@ -486,7 +491,10 @@ class Map final : public Properties, int mDrawScrollX; int mDrawScrollY; int mMask; +#ifdef USE_OPENGL AtlasResource *mAtlas; +#endif // USE_OPENGL + const MapHeights *mHeights; bool mRedrawMap; bool mBeingOpacity; |