diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-31 21:06:01 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-31 21:06:01 +0000 |
| commit | bca15bacae7209a2b75eb82aaf2578a1ce547f57 (patch) | |
| tree | d4ef2a744ae3a259dd9f83c2ff521c406122c46b /crawl-ref/source | |
| parent | 87c78aab3995cccfdcc41de3ac466b0fa2d85657 (diff) | |
| download | crawl-ref-bca15bacae7209a2b75eb82aaf2578a1ce547f57.tar.gz crawl-ref-bca15bacae7209a2b75eb82aaf2578a1ce547f57.zip | |
Commit r9867 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9868 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/misc.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4ddd53ca1a..9f494299d1 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -3189,8 +3189,11 @@ void swap_with_monster(monsters *mon_to_swap) // Code copied from fire/ice in spl-cast.cc void maybe_id_ring_TC() { - if (player_mutation_level(MUT_TELEPORT_CONTROL)) + if (you.duration[DUR_CONTROL_TELEPORT] + || player_mutation_level(MUT_TELEPORT_CONTROL)) + { return; + } int num_unknown = 0; for (int i = EQ_LEFT_RING; i <= EQ_RIGHT_RING; ++i) diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index a6226acecd..56acbc2177 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -581,7 +581,7 @@ void mons_cast_noise(monsters *monster, bolt &pbolt, spell_type spell_cast) const bool priest = mons_class_flag(monster->type, M_PRIEST); const bool wizard = mons_class_flag(monster->type, M_ACTUAL_SPELLS); const bool innate = !(priest || wizard || no_silent) - || (flags & SPFLAG_INNATE); + || (flags & SPFLAG_INNATE); int noise; if (silent 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) |