diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-11 03:29:42 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-11 03:29:42 +0000 |
| commit | 1fcba9f392ee749fe1cb6467fc29bdcbbd1dab2d (patch) | |
| tree | de092ff34c52779d5d64b16f89bb3dc9f1186cf2 /crawl-ref/source/tilereg.cc | |
| parent | 96c783237f95e5cec20eae826415a5ef39c28eff (diff) | |
| download | crawl-ref-1fcba9f392ee749fe1cb6467fc29bdcbbd1dab2d.tar.gz crawl-ref-1fcba9f392ee749fe1cb6467fc29bdcbbd1dab2d.zip | |
...and draw these new spell tiles too.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10652 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index d6ab155493..00a343b141 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -41,6 +41,7 @@ REVISION("$Rev$"); #include "tilefont.h" #include "tilesdl.h" #include "tilemcache.h" +#include "tiledef-gui.h" #include <SDL_opengl.h> @@ -1530,6 +1531,7 @@ InventoryRegion::InventoryRegion(ImageManager* im, FTFont *tag_font, m_flavour(NULL), m_buf_dngn(&im->m_textures[TEX_DUNGEON]), m_buf_main(&im->m_textures[TEX_DEFAULT]), + m_buf_spells(&im->m_textures[TEX_GUI]), m_cursor(NO_CURSOR) { } @@ -1545,6 +1547,7 @@ void InventoryRegion::clear() m_items.clear(); m_buf_dngn.clear(); m_buf_main.clear(); + m_buf_spells.clear(); } void InventoryRegion::on_resize() @@ -1598,6 +1601,7 @@ void InventoryRegion::render() #endif set_transform(); m_buf_dngn.draw(); + m_buf_spells.draw(); m_buf_main.draw(); if (m_cursor != NO_CURSOR) @@ -1652,6 +1656,7 @@ void InventoryRegion::pack_buffers() { m_buf_dngn.clear(); m_buf_main.clear(); + m_buf_spells.clear(); // Ensure the cursor has been placed. place_cursor(m_cursor); @@ -1718,7 +1723,12 @@ void InventoryRegion::pack_buffers() m_buf_main.add(TILE_CURSOR, x, y); if (item.tile) - m_buf_main.add(item.tile, x, y); + { + if (Options.tile_display_spells) + m_buf_spells.add(item.tile, x, y); + else + m_buf_main.add(item.tile, x, y); + } if (item.quantity != -1) { @@ -3847,6 +3857,7 @@ bool ImageManager::load_textures(bool need_mips) m_textures[TEX_DUNGEON].set_info(TILE_DNGN_MAX, &tile_dngn_info); m_textures[TEX_PLAYER].set_info(TILEP_PLAYER_MAX, &tile_player_info); + m_textures[TEX_GUI].set_info(TILEG_GUI_MAX, &tile_gui_info); return (true); } |