diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-28 23:07:05 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-28 23:07:05 +0000 |
| commit | 5331993d1a4db1a03e36a6860edcad756213973b (patch) | |
| tree | c86a58fc1ba3582d0975ff0f5c42a7151445c918 /crawl-ref/source/tilereg.cc | |
| parent | fde21eb9a22782da835911ea2a0d3b70836a81a5 (diff) | |
| download | crawl-ref-5331993d1a4db1a03e36a6860edcad756213973b.tar.gz crawl-ref-5331993d1a4db1a03e36a6860edcad756213973b.zip | |
* Add icons for weapon brands, mostly borrowing from potions/wands and
with a few new creations. :)
* Move tiles for unrandarts and fixedarts into artefact/ subfolders.
* Move the Knife of Accuracy into the unrandart list.
* Add a lab vault containing a hungry ghost (maybe should be rarer).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7680 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index e3eb26e384..9d632c4b8e 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1096,11 +1096,12 @@ void DungeonRegion::clear_overlays() InventoryTile::InventoryTile() { - tile = 0; - idx = -1; + tile = 0; + idx = -1; quantity = -1; - key = 0; - flag = 0; + key = 0; + flag = 0; + special = 0; } bool InventoryTile::empty() const @@ -1142,9 +1143,7 @@ void InventoryRegion::update(unsigned int num, InventoryTile *items) { m_items.clear(); for (unsigned int i = 0; i < num; i++) - { m_items.push_back(items[i]); - } m_need_to_pack = true; } @@ -1232,7 +1231,7 @@ void InventoryRegion::pack_verts() m_need_to_pack = false; m_verts.clear(); - // ensure the cursor has been placed + // Ensure the cursor has been placed. place_cursor(m_cursor); // Pack base separately, as it comes from a different texture... @@ -1330,6 +1329,8 @@ void InventoryRegion::pack_verts() add_quad_char('0' + c1, x, y, offset_x, offset_y); } + if (item.special) + add_quad(TEX_DEFAULT, item.special, x, y, 0, 0, false); if (item.flag & TILEI_FLAG_TRIED) add_quad(TEX_DEFAULT, TILE_TRIED, x, y, 0, TILE_Y / 2, false); @@ -2590,9 +2591,8 @@ void MenuRegion::place_entries() int string_height = m_font_entry->string_height(split); if (string_height > entry_height) - { text_sy = m_entries[i].sy; - } + m_font_buf.add(split, text_sx, text_sy); m_entries[i].ex = entry_start + column_width; |