summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-11 13:03:14 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-11 13:03:14 +0000
commitc05e097028701eec3dfde379c151d86b8463fca7 (patch)
tree42fa5f1512b81af513e45b0935c8ecd6f9e3caab /crawl-ref/source/tilereg.cc
parent1fcba9f392ee749fe1cb6467fc29bdcbbd1dab2d (diff)
downloadcrawl-ref-c05e097028701eec3dfde379c151d86b8463fca7.tar.gz
crawl-ref-c05e097028701eec3dfde379c151d86b8463fca7.zip
Move around a couple of spell tiles, reorder spells in the tiles code,
and document the missing tiles. Also add a tile for small skeletons, and update the change log. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10653 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r--crawl-ref/source/tilereg.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 00a343b141..6c29f9ac13 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -1702,7 +1702,12 @@ void InventoryRegion::pack_buffers()
InventoryTile &item = m_items[i++];
- if (item.flag & TILEI_FLAG_EQUIP)
+ if (Options.tile_display_spells)
+ {
+ if (item.flag & TILEI_FLAG_MELDED)
+ m_buf_main.add(TILE_MESH, x, y);
+ }
+ else if (item.flag & TILEI_FLAG_EQUIP)
{
if (item.flag & TILEI_FLAG_CURSE)
m_buf_main.add(TILE_ITEM_SLOT_EQUIP_CURSED, x, y);