summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-06 05:56:50 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-06 05:56:50 +0000
commitbd1d91f4b91afaf8dd80c329c78b775f43382b87 (patch)
tree38c0cfd9f7268aa1eeb200e19996f63bf24f62b9 /crawl-ref/source/spells3.cc
parent7cd64c37c6b36806e99e92e59581447c9b91560a (diff)
downloadcrawl-ref-bd1d91f4b91afaf8dd80c329c78b775f43382b87.tar.gz
crawl-ref-bd1d91f4b91afaf8dd80c329c78b775f43382b87.zip
Kill hard tabs.
redraw_dexterity now implies redraw_evasion. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@987 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 5adb01c171..77aa6e33c5 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -626,8 +626,8 @@ void you_teleport(void)
void you_teleport2( bool allow_control, bool new_abyss_area )
{
bool is_controlled = (allow_control && !you.conf
- && player_control_teleport()
- && allow_control_teleport());
+ && player_control_teleport()
+ && allow_control_teleport());
if (scan_randarts(RAP_PREVENT_TELEPORTATION))
{