From 631dff0b53511c53e67f3ca9b2b88becf7f7c84c Mon Sep 17 00:00:00 2001 From: ennewalker Date: Sat, 3 Jan 2009 02:38:47 +0000 Subject: 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 --- crawl-ref/source/invent.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/invent.cc') 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& 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 -- cgit v1.2.3-54-g00ecf