summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg.h
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 02:38:47 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 02:38:47 +0000
commit631dff0b53511c53e67f3ca9b2b88becf7f7c84c (patch)
treeb18ee227b93d4cf4291bd0d10b66add1a2152921 /crawl-ref/source/tilereg.h
parent834b2b5479723c391ff2dfdb70940da9592b4bce (diff)
downloadcrawl-ref-631dff0b53511c53e67f3ca9b2b88becf7f7c84c.tar.gz
crawl-ref-631dff0b53511c53e67f3ca9b2b88becf7f7c84c.zip
Tile menus now support multiple tiles per entry (see MenuEntry::get_tiles).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8153 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.h')
-rw-r--r--crawl-ref/source/tilereg.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/tilereg.h b/crawl-ref/source/tilereg.h
index e9a053fb98..f2846e0024 100644
--- a/crawl-ref/source/tilereg.h
+++ b/crawl-ref/source/tilereg.h
@@ -202,13 +202,12 @@ protected:
struct MenuRegionEntry
{
formatted_string text;
- int tile;
- TextureID texture;
int sx, ex, sy, ey;
bool selected;
bool heading;
char key;
bool valid;
+ std::vector<tile_def> tiles;
};
ImageManager *m_image;
@@ -223,7 +222,7 @@ protected:
ShapeBuffer m_shape_buf;
LineBuffer m_line_buf;
FontBuffer m_font_buf;
- TileBuffer m_tile_buf;
+ FixedVector<TileBuffer, TEX_MAX> m_tile_buf;
};
class TileRegion : public Region