diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-06-25 23:10:21 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-06-25 23:31:02 +0300 |
commit | af86a79f6ac5c11d1986be8a3d549fef03482789 (patch) | |
tree | 897f5ea665c01daf2bf01dbe1abd677bb8b2a68d /src/render/mobileopenglgraphics.cpp | |
parent | 7ee1d89a656c05b62fa3104b59504afed0037b69 (diff) | |
download | manaplus-af86a79f6ac5c11d1986be8a3d549fef03482789.tar.gz manaplus-af86a79f6ac5c11d1986be8a3d549fef03482789.tar.bz2 manaplus-af86a79f6ac5c11d1986be8a3d549fef03482789.tar.xz manaplus-af86a79f6ac5c11d1986be8a3d549fef03482789.zip |
Add missing checks into render directory.
Diffstat (limited to 'src/render/mobileopenglgraphics.cpp')
-rw-r--r-- | src/render/mobileopenglgraphics.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index 2c337c294..b385d8306 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -154,6 +154,11 @@ bool MobileOpenGLGraphics::setVideoMode(const int w, const int h, static inline void drawQuad(const Image *const image, const int srcX, const int srcY, const int dstX, const int dstY, + const int width, const int height) A_NONNULL(1); + +static inline void drawQuad(const Image *const image, + const int srcX, const int srcY, + const int dstX, const int dstY, const int width, const int height) { // if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D) @@ -198,6 +203,13 @@ static inline void drawRescaledQuad(const Image *const image, const int dstX, const int dstY, const int width, const int height, const int desiredWidth, + const int desiredHeight) A_NONNULL(1); + +static inline void drawRescaledQuad(const Image *const image, + const int srcX, const int srcY, + const int dstX, const int dstY, + const int width, const int height, + const int desiredWidth, const int desiredHeight) { // if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D) @@ -686,6 +698,8 @@ void MobileOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, const Image *const image, int x, int y) { + if (!vertCol || !image) + return; if (vertCol->currentGLImage != image->mGLImage) { ImageVertexes *const vert = new ImageVertexes(); @@ -704,6 +718,8 @@ void MobileOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, void MobileOpenGLGraphics::drawTileCollection(const ImageCollection *const vertCol) { + if (!vertCol) + return; const ImageVertexesVector &draws = vertCol->draws; const ImageCollectionCIter it_end = draws.end(); for (ImageCollectionCIter it = draws.begin(); it != it_end; ++ it) @@ -726,6 +742,8 @@ void MobileOpenGLGraphics::calcPattern(ImageCollection* const vertCol, const int x, const int y, const int w, const int h) const { + if (!vertCol || !image) + return; ImageVertexes *vert = nullptr; if (vertCol->currentGLImage != image->mGLImage) { @@ -823,6 +841,8 @@ void MobileOpenGLGraphics::calcWindow(ImageCollection *const vertCol, const int w, const int h, const ImageRect &imgRect) { + if (!vertCol) + return; ImageVertexes *vert = nullptr; const Image *const image = imgRect.grid[4]; if (vertCol->currentGLImage != image->mGLImage) |