summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-27 18:04:15 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-27 18:04:15 +0000
commit53e843b86663b764932ab7bf2c1c79ecf2b86a87 (patch)
tree4c458f1f4ab3fd43889c51a980f6c30c155dcbfe
parent0c7d47c22ef69e9ff065f835a5036245c0d750f4 (diff)
downloadcrawl-ref-53e843b86663b764932ab7bf2c1c79ecf2b86a87.tar.gz
crawl-ref-53e843b86663b764932ab7bf2c1c79ecf2b86a87.zip
Add shaft tile. Yay!
I've set this as tile for DNGN_TRAP_NATURAL in general as the shaft is currently the only one among those. This may need to be adapted later on. Ideally, the different kinds of mechanical traps (most notably blade and net) should get a tile of their own rather than use the default (arrow) one. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3350 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/rltiles/dc-dngn.txt1
-rw-r--r--crawl-ref/source/rltiles/dc-dngn/dngn_trap_shaft.bmpbin0 -> 2102 bytes
-rw-r--r--crawl-ref/source/tile1.cc2
3 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index b98bfe3dde..56b60bdb8c 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -93,6 +93,7 @@ dngn_enter_hell DNGN_ENTER_HELL
dngn_branch_stairs DNGN_BRANCH_STAIRS
dngn_trap_mechanical DNGN_TRAP_MECHANICAL
dngn_trap_magical DNGN_TRAP_MAGICAL
+dngn_trap_shaft DNGN_TRAP_SHAFT
dngn_trap_iii DNGN_TRAP_III
###847 DNGN_UNDISCOVERED_TRAP
stone_stairs_down DNGN_STONE_STAIRS_DOWN
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_trap_shaft.bmp b/crawl-ref/source/rltiles/dc-dngn/dngn_trap_shaft.bmp
new file mode 100644
index 0000000000..eaee995835
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/dngn_trap_shaft.bmp
Binary files differ
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index b2a86fd705..52877d622f 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1760,7 +1760,7 @@ int tileidx_feature(int object)
case DNGN_TRAP_MAGICAL:
return TILE_DNGN_TRAP_MAGICAL;
case DNGN_TRAP_NATURAL:
- return TILE_TODO;
+ return TILE_DNGN_TRAP_SHAFT;
case DNGN_ENTER_SHOP:
return TILE_DNGN_ENTER_SHOP;
case DNGN_ENTER_LABYRINTH: