diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-03-26 01:54:25 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-03-26 01:54:25 +0000 |
commit | b40bfe580d2dc9038c00521a44fcd6edd352f239 (patch) | |
tree | ab6ca6ea7b4592bba4e10bddac773528f6467853 /src/resources/image.h | |
parent | aa3877cbe156b04c9194856e92ab0dbc129280c1 (diff) | |
download | mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.tar.gz mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.tar.bz2 mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.tar.xz mana-b40bfe580d2dc9038c00521a44fcd6edd352f239.zip |
Images are now exclusively loaded through PhysFS, and Tiled maps should load
fine again.
Diffstat (limited to 'src/resources/image.h')
-rw-r--r-- | src/resources/image.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index a257678b..bee60aab 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -50,28 +50,18 @@ class Image : public Resource virtual ~Image(); /** - * Loads an image. - * - * @param filePath The path to the image file to load. - * @param flags These flags allow controlling the way the image is - * loaded. Currently only IMG_ALPHA is supported, which - * causes alpha layer to be preserved. - * - * @return <code>NULL</code> if the an error occurred, a - * valid pointer otherwise. - */ - static Image *load(const std::string &filePath, int flags); - - /** * Loads an image from a buffer in memory. * * @param buffer The memory buffer containing the image data. * @param bufferSize The size of the memory buffer in bytes. + * @param flags These flags allow controlling the way the image is + * loaded. Currently only IMG_ALPHA is supported, which + * causes alpha layer to be preserved. * * @return <code>NULL</code> if the an error occurred, a valid pointer * otherwise. */ - static Image *load(void* buffer, unsigned int bufferSize); + static Image *load(void* buffer, unsigned int bufferSize, int flags); /** * Creates a new empty image with given height and width. |