summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/rltiles
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-22 21:44:31 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-22 21:44:31 +0000
commitce544c59c46ff880cee13f8f0785ba81a8e056bf (patch)
tree2fd6e22fb200d58b19e84c1b781bebf9282c815e /crawl-ref/source/rltiles
parent3ea0d9a50eeaf5092400eb84dfafb50d04ac2cf7 (diff)
downloadcrawl-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/rltiles')
-rw-r--r--crawl-ref/source/rltiles/dc-item.txt1
-rw-r--r--crawl-ref/source/rltiles/dc-main.txt3
-rw-r--r--crawl-ref/source/rltiles/dc-player.txt1
3 files changed, 1 insertions, 4 deletions
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