From ce544c59c46ff880cee13f8f0785ba81a8e056bf Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 22 Jul 2009 21:44:31 +0000 Subject: 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 --- crawl-ref/source/menu.cc | 2 +- crawl-ref/source/rltiles/dc-item.txt | 1 - crawl-ref/source/rltiles/dc-main.txt | 3 --- crawl-ref/source/rltiles/dc-player.txt | 1 + crawl-ref/source/tilereg.cc | 6 +----- crawl-ref/source/tilesdl.cc | 20 +++++++++++++++----- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index bc58a60c23..8dfe5bc842 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -901,7 +901,7 @@ bool PlayerMenuEntry::get_tiles(std::vector& tileset) const } if (player.held_in_net) - tileset.push_back(tile_def(TILE_TRAP_NET, TEX_DEFAULT)); + tileset.push_back(tile_def(TILEP_TRAP_NET, TEX_PLAYER)); return (true); } diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index 7ebc8ae46e..7171a54f96 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -228,7 +228,6 @@ effect/throwing_net4 MI_THROWING_NET4 effect/throwing_net5 MI_THROWING_NET5 effect/throwing_net6 MI_THROWING_NET6 effect/throwing_net7 MI_THROWING_NET7 -effect/net_trap TRAP_NET item/gem/rock MI_LARGE_ROCK effect/rock0 MI_LARGE_ROCK0 diff --git a/crawl-ref/source/rltiles/dc-main.txt b/crawl-ref/source/rltiles/dc-main.txt index 870e204bb8..17c055a0f6 100644 --- a/crawl-ref/source/rltiles/dc-main.txt +++ b/crawl-ref/source/rltiles/dc-main.txt @@ -13,9 +13,6 @@ dc-dngn/dngn_unseen ## Corpse %include dc-corpse.txt -####PLAYER -####include dc-jobs.txt - #### Effects, etc. %include dc-misc.txt diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt index 7ba05ae239..e6366c51df 100644 --- a/crawl-ref/source/rltiles/dc-player.txt +++ b/crawl-ref/source/rltiles/dc-player.txt @@ -866,4 +866,5 @@ drchead_red RED drchead_white WHITE %end +effect/net_trap TRAP_NET dc-misc/error ERROR 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); } diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index c84fcd9c30..9a6fc6a5dd 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -148,7 +148,6 @@ void TilesFramework::shutdown() delete m_region_inv; delete m_region_crt; delete m_region_menu; - delete m_region_title; m_region_tile = NULL; m_region_stat = NULL; @@ -157,7 +156,12 @@ void TilesFramework::shutdown() m_region_inv = NULL; m_region_crt = NULL; m_region_menu = NULL; - m_region_title = NULL; + + if (m_region_title) + { + delete m_region_title; + m_region_title = NULL; + } for (unsigned int i = 0; i < LAYER_MAX; i++) m_layers[i].m_regions.clear(); @@ -180,6 +184,9 @@ void TilesFramework::draw_title() mouse_control mc(MOUSE_MODE_MORE); getch(); + + delete m_region_title; + m_region_title = NULL; } void TilesFramework::calculate_default_options() @@ -331,8 +338,6 @@ bool TilesFramework::initialise() m_region_crt = new CRTRegion(m_fonts[crt_font].font); m_region_menu = new MenuRegion(&m_image, m_fonts[crt_font].font); - m_region_title = new TitleRegion(m_windowsz.x, m_windowsz.y); - m_layers[LAYER_NORMAL].m_regions.push_back(m_region_map); m_layers[LAYER_NORMAL].m_regions.push_back(m_region_tile); m_layers[LAYER_NORMAL].m_regions.push_back(m_region_inv); @@ -342,7 +347,12 @@ bool TilesFramework::initialise() m_layers[LAYER_CRT].m_regions.push_back(m_region_crt); m_layers[LAYER_CRT].m_regions.push_back(m_region_menu); - m_layers[LAYER_TITLE].m_regions.push_back(m_region_title); + // Only initialize title region if we'll actually want to draw it. + if (Options.tile_title_screen) + { + m_region_title = new TitleRegion(m_windowsz.x, m_windowsz.y); + m_layers[LAYER_TITLE].m_regions.push_back(m_region_title); + } cgotoxy(1, 1, GOTO_CRT); -- cgit v1.2.3-54-g00ecf