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-07-03 16:18:02 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-03 16:18:02 +0000
commit2c2a0304ec8308f912860f05dc1099b86f71773c (patch)
tree26a30495b0700fcb595aeafb7b3149c9f73d18d6 /crawl-ref/source/tilereg.cc
parent1127ccc6b5bd418aead10e6b968aeef4d6909551 (diff)
downloadcrawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.tar.gz
crawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.zip
* Fix centaur/naga tiles not being displayed correctly in the character
selection menu. * Add dolls_data to player_save_info struct, to make it easier to read in per-character doll information once we get around to that. Including the tiledef files in externs.h is probably overkill, though, so we might want to move player_save_info into another header file. * Fix Xom's repel stair effect moving shops. * Fix decks granting permanent summons at low power (and only at low power). * Make default settings of the brand options consistent between init.txt and initfile.cc. * Update FAQ. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10086 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r--crawl-ref/source/tilereg.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 0bd0c025ac..6ac5035efa 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -3074,7 +3074,10 @@ void MenuRegion::place_entries()
int tile = m_entries[i].tiles[t].tile;
TextureID tex = m_entries[i].tiles[t].tex;
m_tile_buf[tex].add_unscaled(tile, m_entries[i].sx,
- m_entries[i].sy);
+ m_entries[i].sy,
+ m_entries[i].tiles[t].ymax);
+// m_tile_buf[tex].add(tile, m_entries[i].sx, m_entries[i].sy,
+// 0, 0, true, TILE_Y);
}
}
else
@@ -3085,7 +3088,7 @@ void MenuRegion::place_entries()
int text_sy = m_entries[i].sy;
text_sy += (entry_height - m_font_entry->char_height()) / 2;
- // Split menu entries that don't fit into a single lines into
+ // Split menu entries that don't fit into a single line into
// two lines.
if (Options.tile_menu_icons
&& text_sx + text_width > entry_start + column_width)