diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-04-08 23:03:50 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-04-08 23:03:50 +0300 |
commit | 179e13363899112b9a1181eb10e0754b583a63eb (patch) | |
tree | e62bbb898d597f831922c561e651ef4a91600b4e | |
parent | 6f6cd2724b55415e2c6f6247ca656941a8e5d5bd (diff) | |
download | manaplus-179e13363899112b9a1181eb10e0754b583a63eb.tar.gz manaplus-179e13363899112b9a1181eb10e0754b583a63eb.tar.bz2 manaplus-179e13363899112b9a1181eb10e0754b583a63eb.tar.xz manaplus-179e13363899112b9a1181eb10e0754b583a63eb.zip |
Fix compilation error with SDL 2.
-rw-r--r-- | src/render/mobileopengl2graphics.cpp | 2 | ||||
-rw-r--r-- | src/render/mobileopenglgraphics.cpp | 2 | ||||
-rw-r--r-- | src/render/modernopenglgraphics.cpp | 2 | ||||
-rw-r--r-- | src/render/normalopenglgraphics.cpp | 2 | ||||
-rw-r--r-- | src/render/nullopenglgraphics.cpp | 2 | ||||
-rw-r--r-- | src/resources/image/subimage.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 62a53fed6..a9bb2dbeb 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -1321,7 +1321,7 @@ void MobileOpenGL2Graphics::drawLineArrays(const int size) restrict2 void MobileOpenGL2Graphics::debugBindTexture(const Image *restrict const image) restrict2 { - const std::string texture = image->getIdPath(); + const std::string texture = image->mIdPath; if (mOldTexture != texture) { if ((!mOldTexture.empty() || !texture.empty()) diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index c22a7ac0f..c5faad5c9 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -1327,7 +1327,7 @@ void MobileOpenGLGraphics::clearScreen() const restrict2 void MobileOpenGLGraphics::debugBindTexture(const Image *restrict const image) restrict2 { - const std::string texture = image->getIdPath(); + const std::string texture = image->mIdPath; if (mOldTexture != texture) { if ((!mOldTexture.empty() || !texture.empty()) diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 84843098c..c4f886314 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -1333,7 +1333,7 @@ void ModernOpenGLGraphics::drawLineArrays(const int size) void ModernOpenGLGraphics::debugBindTexture(const Image *restrict const image) restrict2 { - const std::string texture = image->getIdPath(); + const std::string texture = image->mIdPath; if (mOldTexture != texture) { if ((!mOldTexture.empty() || !texture.empty()) diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 429fa2256..27432f044 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -1702,7 +1702,7 @@ void NormalOpenGLGraphics::clearScreen() const restrict2 void NormalOpenGLGraphics::debugBindTexture(const Image *restrict const image) restrict2 { - const std::string texture = image->getIdPath(); + const std::string texture = image->mIdPath; if (mOldTexture != texture) { if ((!mOldTexture.empty() || !texture.empty()) diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index c4985f758..c5c18295d 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -1222,7 +1222,7 @@ void NullOpenGLGraphics::clearScreen() const restrict2 void NullOpenGLGraphics::debugBindTexture(const Image *restrict const image) restrict2 { - const std::string texture = image->getIdPath(); + const std::string texture = image->mIdPath; if (mOldTexture != texture) { if ((!mOldTexture.empty() || !texture.empty()) diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp index 20ed676d7..7d936ecbf 100644 --- a/src/resources/image/subimage.cpp +++ b/src/resources/image/subimage.cpp @@ -44,12 +44,12 @@ SubImage::SubImage(Image *const parent, mHasAlphaChannel = mParent->hasAlphaChannel(); mIsAlphaVisible = mHasAlphaChannel; mAlphaChannel = mParent->SDLgetAlphaChannel(); - mSource = parent->getIdPath(); + mSource = parent->mIdPath; #ifdef DEBUG_IMAGES logger->log("set name2 %p, %s", this, mSource.c_str()); #endif // DEBUG_IMAGES #ifdef DEBUG_BIND_TEXTURE - mIdPath = parent->getIdPath(); + mIdPath = parent->mIdPath; #endif // DEBUG_BIND_TEXTURE } else |