From bca15bacae7209a2b75eb82aaf2578a1ce547f57 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 31 May 2009 21:06:01 +0000 Subject: Commit r9867 to trunk. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9868 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/player.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index d986ff62be..1c1fae0b70 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1558,10 +1558,10 @@ bool player_res_asphyx() bool player_control_teleport(bool calc_unid, bool temp, bool items) { - return ( (you.duration[DUR_CONTROL_TELEPORT] && temp) - || (player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid) - && items) - || player_mutation_level(MUT_TELEPORT_CONTROL) ); + return ((temp && you.duration[DUR_CONTROL_TELEPORT]) + || (items + && player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid)) + || player_mutation_level(MUT_TELEPORT_CONTROL)); } int player_res_torment(bool) -- cgit v1.2.3-54-g00ecf