From b624b0a4d6410134072c894d5686335c588a6c99 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Mar 2018 07:31:43 +0300
Subject: Fix compilation without OpenGL.

---
 src/resources/map/map.cpp |  6 ++++++
 src/resources/map/map.h   | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index c9636183e..656f10fba 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -147,7 +147,9 @@ Map::Map(const std::string &name,
     mDrawScrollX(-1),
     mDrawScrollY(-1),
     mMask(1),
+#ifdef USE_OPENGL
     mAtlas(nullptr),
+#endif  // USE_OPENGL
     mHeights(nullptr),
     mRedrawMap(true),
     mBeingOpacity(false),
@@ -192,11 +194,13 @@ Map::~Map()
     delete2(mTempLayer);
     delete2(mObjects);
     delete_all(mMapPortals);
+#ifdef USE_OPENGL
     if (mAtlas != nullptr)
     {
         mAtlas->decRef();
         mAtlas = nullptr;
     }
+#endif  // USE_OPENGL
     delete2(mHeights);
     delete [] mMetaTiles;
 }
@@ -1794,9 +1798,11 @@ int Map::calcMemoryChilds(const int level) const
     return sz;
 }
 
+#ifdef USE_OPENGL
 int Map::getAtlasCount() const restrict2
 {
     if (mAtlas == nullptr)
         return 0;
     return CAST_S32(mAtlas->atlases.size());
 }
+#endif  // USE_OPENGL
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;
-- 
cgit v1.2.3-70-g09d2