summaryrefslogtreecommitdiff
path: root/src/openglgraphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-17 23:26:59 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-17 23:26:59 +0300
commit7e0a97d2521b9ce57003176e82a0b5564aa003c2 (patch)
tree5b2cfe1afe09bea1063f783050c1fb549daee76d /src/openglgraphics.cpp
parentf68cbf700a99f2f184715a5b8025bcb4b6525391 (diff)
downloadmanaplus-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/openglgraphics.cpp')
-rw-r--r--src/openglgraphics.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index e53f4e11b..4edcb089d 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -206,9 +206,9 @@ static inline void drawRescaledQuad(Image *image,
}
-bool OpenGLGraphics::drawImage(const Image *image, int srcX, int srcY,
- int dstX, int dstY,
- int width, int height, bool useColor)
+bool OpenGLGraphics::drawImage2(const Image *image, int srcX, int srcY,
+ int dstX, int dstY,
+ int width, int height, bool useColor)
{
if (!image)
return false;
@@ -264,8 +264,8 @@ bool OpenGLGraphics::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,