summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-08-05 16:39:32 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-08-05 16:40:36 +0200
commit363f71157a8107190b3bd2ba656faf0a0e63ab36 (patch)
tree4e86324c312f2d78b261d88d5b470a4a7cbf9f94
parent4eea727b7649726670d8963d11ab4fd429624b3e (diff)
downloadmana-client-363f71157a8107190b3bd2ba656faf0a0e63ab36.tar.gz
mana-client-363f71157a8107190b3bd2ba656faf0a0e63ab36.tar.bz2
mana-client-363f71157a8107190b3bd2ba656faf0a0e63ab36.tar.xz
mana-client-363f71157a8107190b3bd2ba656faf0a0e63ab36.zip
Revert "Graphics: take only const pointers to images."
This reverts commit 4eea727b7649726670d8963d11ab4fd429624b3e. It broke the overrides of the virtual functions and leaves the Graphics API in inconsistent state with some Image* being const and others not.
-rw-r--r--src/graphics.cpp6
-rw-r--r--src/graphics.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 8bd16faa..7b56d974 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -146,7 +146,7 @@ int Graphics::getHeight() const
return mHeight;
}
-bool Graphics::drawImage(const Image *image, int x, int y)
+bool Graphics::drawImage(Image *image, int x, int y)
{
if (image)
return drawImage(image, 0, 0, x, y, image->mBounds.w, image->mBounds.h);
@@ -193,7 +193,7 @@ bool Graphics::drawRescaledImage(Image *image, int srcX, int srcY,
return returnValue;
}
-bool Graphics::drawImage(const Image *image, int srcX, int srcY, int dstX, int dstY,
+bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
int width, int height, bool)
{
// Check that preconditions for blitting are met.
@@ -228,7 +228,7 @@ void Graphics::drawImage(gcn::Image const *image, int srcX, int srcY,
drawImage(srcImage->getImage(), srcX, srcY, dstX, dstY, width, height, true);
}
-void Graphics::drawImagePattern(const Image *image, int x, int y, int w, int h)
+void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h)
{
// Check that preconditions for blitting are met.
if (!mTarget || !image)
diff --git a/src/graphics.h b/src/graphics.h
index c70e7978..6a17aab4 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -99,7 +99,7 @@ class Graphics : public gcn::SDLGraphics
* @return <code>true</code> if the image was blitted properly
* <code>false</code> otherwise.
*/
- bool drawImage(const Image *image, int x, int y);
+ bool drawImage(Image *image, int x, int y);
/**
* Overrides with our own drawing method.
@@ -135,13 +135,13 @@ class Graphics : public gcn::SDLGraphics
* @return <code>true</code> if the image was blitted properly
* <code>false</code> otherwise.
*/
- virtual bool drawImage(const Image *image,
+ virtual bool drawImage(Image *image,
int srcX, int srcY,
int dstX, int dstY,
int width, int height,
bool useColor = false);
- virtual void drawImagePattern(const Image *image,
+ virtual void drawImagePattern(Image *image,
int x, int y,
int w, int h);