diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-07-17 23:26:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-07-17 23:26:59 +0300 |
| commit | 7e0a97d2521b9ce57003176e82a0b5564aa003c2 (patch) | |
| tree | 5b2cfe1afe09bea1063f783050c1fb549daee76d /src/opengl1graphics.cpp | |
| parent | f68cbf700a99f2f184715a5b8025bcb4b6525391 (diff) | |
| download | manaplus-7e0a97d2521b9ce57003176e82a0b5564aa003c2.tar.gz manaplus-7e0a97d2521b9ce57003176e82a0b5564aa003c2.tar.bz2 manaplus-7e0a97d2521b9ce57003176e82a0b5564aa003c2.tar.xz manaplus-7e0a97d2521b9ce57003176e82a0b5564aa003c2.zip | |
Fix more code style and additional warnings.
Diffstat (limited to 'src/opengl1graphics.cpp')
| -rw-r--r-- | src/opengl1graphics.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index 1d5273ffe..88079c2bd 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -140,9 +140,9 @@ static inline void drawRescaledQuad(Image *image, int srcX, int srcY, } -bool OpenGL1Graphics::drawImage(const Image *image, int srcX, int srcY, - int dstX, int dstY, - int width, int height, bool useColor) +bool OpenGL1Graphics::drawImage2(const Image *image, int srcX, int srcY, + int dstX, int dstY, + int width, int height, bool useColor) { if (!image) return false; @@ -198,8 +198,8 @@ bool OpenGL1Graphics::drawRescaledImage(Image *image, int srcX, int srcY, // Just draw the image normally when no resizing is necessary, if (width == desiredWidth && height == desiredHeight) { - return drawImage(image, srcX, srcY, dstX, dstY, - width, height, useColor); + return drawImage2(image, srcX, srcY, dstX, dstY, + width, height, useColor); } // When the desired image is smaller than the current one, |