From 9fd59af7bc9de80793ca8cff2c626e2324076d90 Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Wed, 2 Dec 2009 20:56:27 +1000 Subject: Don't prompt for cancelling Wizard teleport. Also ignore beholders. --- crawl-ref/source/spells3.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/spells3.cc') diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 75f12203a8..34940a3df1 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1490,15 +1490,16 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar if (pos == you.pos() || pos == coord_def(-1,-1)) { - if (!yesno("Are you sure you want to cancel this teleport?", - true, 'n')) - continue; + if (!wizard_tele) + if (!yesno("Are you sure you want to cancel this teleport?", + true, 'n')) + continue; you.turn_is_over = false; return (false); } monsters *beholder = you.get_beholder(pos); - if (beholder) + if (beholder && !wizard_tele) { mprf("You cannot teleport away from %s!", beholder->name(DESC_NOCAP_THE, true).c_str()); -- cgit v1.2.3-54-g00ecf