summaryrefslogtreecommitdiff
path: root/src/resources/imageset.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:42:53 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:43:55 +0100
commit1715d0afe44a282a356ca88e47c92ec556f094dd (patch)
tree36dcaa69dcf0165c33d7da1c1cc1a9f5fb7e228f /src/resources/imageset.h
parent511d9ac780e094767e806c9a448ac973279dd4c8 (diff)
downloadmana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.gz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.bz2
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.xz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.zip
Fixed include structure in resource/ directory
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
Diffstat (limited to 'src/resources/imageset.h')
-rw-r--r--src/resources/imageset.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index f59c76bb..f4464017 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -22,9 +22,9 @@
#ifndef IMAGESET_H
#define IMAGESET_H
-#include <vector>
+#include "resources/resource.h"
-#include "resource.h"
+#include <vector>
class Image;
@@ -34,7 +34,7 @@ class Image;
class ImageSet : public Resource
{
public:
- /*
+ /**
* Cuts the passed image in a grid of sub images.
*/
ImageSet(Image *img, int w, int h);
@@ -47,12 +47,12 @@ class ImageSet : public Resource
/**
* Returns the width of the images in the image set.
*/
- int getWidth() const { return mWidth; };
+ int getWidth() const { return mWidth; }
/**
* Returns the height of the images in the image set.
*/
- int getHeight() const { return mHeight; };
+ int getHeight() const { return mHeight; }
typedef std::vector<Image*>::size_type size_type;
Image* get(size_type i) const;