diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 02:38:47 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 02:38:47 +0000 |
| commit | 631dff0b53511c53e67f3ca9b2b88becf7f7c84c (patch) | |
| tree | b18ee227b93d4cf4291bd0d10b66add1a2152921 /crawl-ref/source/invent.cc | |
| parent | 834b2b5479723c391ff2dfdb70940da9592b4bce (diff) | |
| download | crawl-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/invent.cc')
| -rw-r--r-- | crawl-ref/source/invent.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index ac1e6f5b86..7d96c65819 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -417,15 +417,19 @@ void InvMenu::load_inv_items(int item_selector, int excluded_slot, } #ifdef USE_TILE -bool InvEntry::tile(int &idx, TextureID &tex) const +bool InvEntry::get_tiles(std::vector<tile_def>& tileset) const { if (quantity <= 0) return (false); - idx = tileidx_item(*item); - tex = TEX_DEFAULT; + int idx = tileidx_item(*item); + if (!idx) + return (false); + + tileset.push_back(tile_def(TILE_ITEM_SLOT, TEX_DUNGEON)); + tileset.push_back(tile_def(idx, TEX_DEFAULT)); - return (idx != 0); + return (true); } #endif |