diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 21:44:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-22 21:44:31 +0000 |
| commit | ce544c59c46ff880cee13f8f0785ba81a8e056bf (patch) | |
| tree | 2fd6e22fb200d58b19e84c1b781bebf9282c815e /crawl-ref/source/tilereg.cc | |
| parent | 3ea0d9a50eeaf5092400eb84dfafb50d04ac2cf7 (diff) | |
| download | crawl-ref-ce544c59c46ff880cee13f8f0785ba81a8e056bf.tar.gz crawl-ref-ce544c59c46ff880cee13f8f0785ba81a8e056bf.zip | |
Apply patch 2825337 by zebez: move trapping net tile to player.png to
save on memory and only load title.png if Options.tile_title_screen is
true.
Also: delete m_region_title once the title screen was shown.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10376 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 096d45bd54..7ca7a2efbc 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -879,7 +879,7 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int } if (fg & TILE_FLAG_NET) - m_buf_main.add(TILE_TRAP_NET, x, y); + m_buf_doll.add(TILEP_TRAP_NET, x, y); if (fg & TILE_FLAG_S_UNDER) m_buf_main.add(TILE_SOMETHING_UNDER, x, y); @@ -3369,12 +3369,8 @@ bool ImageManager::load_textures() if (!m_textures[TEX_PLAYER].load_texture("player.png", mip)) return (false); - if (!m_textures[TEX_DEFAULT].load_texture("main.png", mip)) - return (false); - 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_DEFAULT].set_info(TILE_MAIN_MAX, &tile_main_info); return (true); } |