summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-25 08:42:38 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-25 08:42:38 +0000
commitc5ab08484a85c0f7f25bd8199d0e1c688e08eba3 (patch)
tree9d6b6f646cfaf83418aad472c2787709a9ec19e1 /crawl-ref/source/delay.cc
parenta24ec8490ffcc7348f567b96577c4cf841d1411f (diff)
downloadcrawl-ref-c5ab08484a85c0f7f25bd8199d0e1c688e08eba3.tar.gz
crawl-ref-c5ab08484a85c0f7f25bd8199d0e1c688e08eba3.zip
[1861488] Fixed passwall bugs.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3330 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 7cac0e227a..50380cf0b2 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -777,23 +777,15 @@ static void finish_delay(const delay_queue_item &delay)
switch (grd[ pass_x ][ pass_y ])
{
- case DNGN_ROCK_WALL:
- case DNGN_STONE_WALL:
- case DNGN_CLEAR_ROCK_WALL:
- case DNGN_CLEAR_STONE_WALL:
- case DNGN_METAL_WALL:
- case DNGN_GREEN_CRYSTAL_WALL:
- case DNGN_WAX_WALL:
- ouch(1 + you.hp, 0, KILLED_BY_PETRIFICATION);
+ default:
+ if (!you.can_pass_through_feat(grd[pass_x][pass_y]))
+ ouch(1 + you.hp, 0, KILLED_BY_PETRIFICATION);
break;
case DNGN_SECRET_DOOR: // oughtn't happen
case DNGN_CLOSED_DOOR: // open the door
grd[ pass_x ][ pass_y ] = DNGN_OPEN_DOOR;
break;
-
- default:
- break;
}
// move any monsters out of the way: