diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-03-13 11:37:47 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-03-13 11:37:47 +0000 |
commit | cd2c4f5861c89f0925a1a706e38535d6c11cc3a0 (patch) | |
tree | 232273a1d853305deea6e3101dd7ceef9fb76930 /src/resources/image.h | |
parent | a03175439e5abaae8603a85be0db173daa543f6b (diff) | |
download | mana-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.tar.gz mana-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.tar.bz2 mana-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.tar.xz mana-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.zip |
Converted ChatBox into a proper ChatWindow in response to changes by Chetic.
Diffstat (limited to 'src/resources/image.h')
-rw-r--r-- | src/resources/image.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index ebee50d3..a257678b 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -26,10 +26,8 @@ #include "resource.h" #include <SDL.h> - -#ifdef USE_OPENGL #include <SDL_opengl.h> -#endif +#include <string> // This flag causes image alpha channel to be preserved, otherwise masking is // used. @@ -97,8 +95,9 @@ class Image : public Resource /** * Creates a new image with the desired clipping rectangle. + * * @return <code>NULL</code> if creation failed and a valid - * object otherwise. + * object otherwise. */ virtual Image* getSubImage(int x, int y, int width, int height); |