summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/viewmap.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2014-01-09 02:27:23 +0100
committerAdam Borowski <kilobyte@angband.pl>2014-01-09 13:23:03 +0100
commit9e3a7cbb366465722e9e766569099b2273e0e43d (patch)
tree234f39594990d8875384420186addc8436a62bfa /crawl-ref/source/viewmap.cc
parent38ea213ded91da192ebdb0bfd7bdc776472be8c2 (diff)
downloadcrawl-ref-9e3a7cbb366465722e9e766569099b2273e0e43d.tar.gz
crawl-ref-9e3a7cbb366465722e9e766569099b2273e0e43d.zip
Assert-crash if the player somehow ends up in a wall.
Wizmode XT is explicitely allowed: if we banned that, there's currently no good replacement for going into a wall and &(
Diffstat (limited to 'crawl-ref/source/viewmap.cc')
-rw-r--r--crawl-ref/source/viewmap.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index 2ad0c26f84..3aea47c5d7 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -1258,6 +1258,8 @@ bool show_map(level_pos &lpos,
case CMD_MAP_WIZARD_TELEPORT:
if (!you.wizard || !on_level || !in_bounds(lpos.pos))
break;
+ if (cell_is_solid(lpos.pos))
+ you.wizmode_teleported_into_rock = true;
you.moveto(lpos.pos);
map_alive = false;
break;