From c07f2c46323c57f9d5699293e3e4458d5bbacde5 Mon Sep 17 00:00:00 2001 From: haranp Date: Fri, 3 Oct 2008 20:00:42 +0000 Subject: Some cleanup (replacing you.duration[DUR_CONF] with you.confused()) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7108 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells3.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crawl-ref/source/spells3.cc') diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 3a00fd310d..9cb7ac7434 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1238,7 +1238,7 @@ void you_teleport(void) static bool _teleport_player( bool allow_control, bool new_abyss_area ) { - bool is_controlled = (allow_control && !you.duration[DUR_CONF] + bool is_controlled = (allow_control && !you.confused() && player_control_teleport() && allow_control_teleport()); -- cgit v1.2.3-54-g00ecf