summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-transloc.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-03-26 22:41:14 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-03-27 01:50:49 +0100
commit571f73be4f79efd4e60c217f23786132c96bd11f (patch)
tree48686f814c88e992e05da672dc21243fd373eeaf /crawl-ref/source/spl-transloc.cc
parent7eaaf63a10138b1766130ece1916b2768775ac7f (diff)
downloadcrawl-ref-571f73be4f79efd4e60c217f23786132c96bd11f.tar.gz
crawl-ref-571f73be4f79efd4e60c217f23786132c96bd11f.zip
Fix teleporter vault trapping players.
Or, robbing them of XP and items unless they're spoiled (Nemelex's Gamble). In other cases, it's a matter of disrobing just to go through, which is a mere inconvenience except for zigsprint, where it was special-cased (yay consistency). It was also inconsistent with all other fixed means of teleportation, such as Passage of Golubria, portal vaults, hell portals, abyss portals, etc, which all are not swayed by mere -TELE. In the first discussion that happened, the only reasoning for the change was similarity of names between "teleporter" and "-TELE", rather than gameplay reasons. So let's deal with that instead. This reverts commit 7f0416492553db52d7613d506b8ab584b7819904.
Diffstat (limited to 'crawl-ref/source/spl-transloc.cc')
-rw-r--r--crawl-ref/source/spl-transloc.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc
index 7c93d7155d..97cc8fefb2 100644
--- a/crawl-ref/source/spl-transloc.cc
+++ b/crawl-ref/source/spl-transloc.cc
@@ -697,7 +697,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area,
return (!is_controlled);
}
-bool you_teleport_to(const coord_def where_to, bool move_monsters, bool override_stasis)
+bool you_teleport_to(const coord_def where_to, bool move_monsters)
{
// Attempts to teleport the player from their current location to 'where'.
// Follows this line of reasoning:
@@ -710,12 +710,6 @@ bool you_teleport_to(const coord_def where_to, bool move_monsters, bool override
// then teleport the player there.
// 4. If not, give up and return false.
- if (you.no_tele(true, true) && !override_stasis)
- {
- canned_msg(MSG_STRANGE_STASIS);
- return false;
- }
-
bool check_ring_TC = false;
const coord_def old_pos = you.pos();
coord_def where = where_to;