diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-07-01 17:41:30 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-07-01 17:41:30 +0000 |
commit | 4ca8675700dfae625376c4afdd30b8590d68087e (patch) | |
tree | 7f661baf3d566fcf5d0318da13e29c13098cf21a /src/resources/imageset.h | |
parent | cf5cfbcb8ff63005b1e08f9718ce3f80f919271e (diff) | |
download | mana-4ca8675700dfae625376c4afdd30b8590d68087e.tar.gz mana-4ca8675700dfae625376c4afdd30b8590d68087e.tar.bz2 mana-4ca8675700dfae625376c4afdd30b8590d68087e.tar.xz mana-4ca8675700dfae625376c4afdd30b8590d68087e.zip |
Merged revisions 4044-4067 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r4044 | b_lindeijer | 2008-04-07 11:02:38 +0200 (Mon, 07 Apr 2008) | 2 lines
Added support for basing one sprite definition on another by including it.
........
r4057 | b_lindeijer | 2008-04-08 20:43:44 +0200 (Tue, 08 Apr 2008) | 4 lines
Implemented support for an arbitrary number of map layers. The only layer
requirement for map layers are now that the fringe layer is called "Fringe" and
that the collision layer is called "Collision".
........
r4067 | b_lindeijer | 2008-04-11 00:03:57 +0200 (Fri, 11 Apr 2008) | 3 lines
Fixed some compiler warnings and don't try to load particle effects when no
file is set.
........
Diffstat (limited to 'src/resources/imageset.h')
-rw-r--r-- | src/resources/imageset.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 15c21d90..fa1840ec 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -47,14 +47,20 @@ class ImageSet : public Resource */ ~ImageSet(); - int getWidth() { return mWidth; }; + /** + * Returns the width of the images in the image set. + */ + int getWidth() const { return mWidth; }; - int getHeight() { return mHeight; }; + /** + * Returns the height of the images in the image set. + */ + int getHeight() const { return mHeight; }; typedef std::vector<Image*>::size_type size_type; - Image* get(size_type i); + Image* get(size_type i) const; - size_type size() { return mImages.size(); } + size_type size() const { return mImages.size(); } private: std::vector<Image*> mImages; |