summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-24 19:45:33 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-24 19:45:33 +0100
commita18d4dcf1eb9abb9b4ed8060aefd14088ccb9680 (patch)
treed625a96d6d978d00644e9dd6ffd75e099eb43149 /src/resources
parenta928798a9326de1e6781e14c8ccf5abec1232385 (diff)
downloadmana-client-a18d4dcf1eb9abb9b4ed8060aefd14088ccb9680.tar.gz
mana-client-a18d4dcf1eb9abb9b4ed8060aefd14088ccb9680.tar.bz2
mana-client-a18d4dcf1eb9abb9b4ed8060aefd14088ccb9680.tar.xz
mana-client-a18d4dcf1eb9abb9b4ed8060aefd14088ccb9680.zip
Code reformatting
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.h32
1 files changed, 13 insertions, 19 deletions
diff --git a/src/resources/image.h b/src/resources/image.h
index faaf3db7..2c0569f9 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -54,8 +54,7 @@ class Image : public Resource
/**
* Destructor.
*/
- virtual
- ~Image();
+ virtual ~Image();
/**
* Loads an image from a buffer in memory.
@@ -78,7 +77,8 @@ class Image : public Resource
* @return <code>NULL</code> if an error occurred, a valid pointer
* otherwise.
*/
- static Resource *load(void *buffer, unsigned bufferSize, Dye const &dye);
+ static Resource *load(void *buffer, unsigned bufferSize,
+ Dye const &dye);
/**
* Loads an image from an SDL surface.
@@ -88,21 +88,20 @@ class Image : public Resource
/**
* Frees the resources created by SDL.
*/
- virtual void
- unload();
+ virtual void unload();
/**
* Returns the width of the image.
*/
- virtual int
- getWidth() const { return mBounds.w; }
+ virtual int getWidth() const
+ { return mBounds.w; }
/**
* Returns the height of the image.
*/
- virtual int
- getHeight() const { return mBounds.h; }
+ virtual int getHeight() const
+ { return mBounds.h; }
/**
* Creates a new image with the desired clipping rectangle.
@@ -110,20 +109,17 @@ class Image : public Resource
* @return <code>NULL</code> if creation failed and a valid
* object otherwise.
*/
- virtual Image*
- getSubImage(int x, int y, int width, int height);
+ virtual Image *getSubImage(int x, int y, int width, int height);
/**
* Sets the alpha value of this image.
*/
- void
- setAlpha(float alpha);
+ void setAlpha(float alpha);
/**
* Returns the alpha value of this image.
*/
- float
- getAlpha();
+ float getAlpha();
#ifdef USE_OPENGL
/**
@@ -145,8 +141,7 @@ class Image : public Resource
/**
* Returns the first power of two equal or bigger than the input.
*/
- static int
- powerOfTwo(int input);
+ static int powerOfTwo(int input);
#endif
Image(SDL_Surface *image);
@@ -192,8 +187,7 @@ class SubImage : public Image
* @return <code>NULL</code> if creation failed and a valid
* image otherwise.
*/
- Image*
- getSubImage(int x, int y, int width, int height);
+ Image *getSubImage(int x, int y, int width, int height);
private:
Image *mParent;