diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-23 20:32:37 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-23 20:32:37 +0000 |
| commit | 6f00e679d1f90041599c50c3cc86ab4e499c9ba1 (patch) | |
| tree | 2e1ceeed3d328f639166d0ca53dddbd6fba6cdcf /crawl-ref/source/abl-show.cc | |
| parent | 0b1e914465f3e3f1f4c73f63cf2346c3f2253861 (diff) | |
| download | crawl-ref-6f00e679d1f90041599c50c3cc86ab4e499c9ba1.tar.gz crawl-ref-6f00e679d1f90041599c50c3cc86ab4e499c9ba1.zip | |
More cleanups and fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6648 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index f0e01f7ed8..858e5ceed9 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1738,7 +1738,7 @@ static bool _do_ability(const ability_def& abil) if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY)) return (false); - if (beam.target_x == you.x_pos && beam.target_y == you.y_pos) + if (beam.target() == you.pos()) { mpr("You cannot banish yourself!"); return (false); @@ -2159,7 +2159,7 @@ std::vector<talent> your_talents( bool check_confused ) // Gods take abilities away until penance completed. -- bwr // God abilities generally don't work while silenced (they require // invoking the god), but Nemelex is an exception. - if (!player_under_penance() && (!silenced(you.x_pos, you.y_pos) + if (!player_under_penance() && (!silenced(you.pos()) || you.religion == GOD_NEMELEX_XOBEH)) { for (int i = 0; i < MAX_GOD_ABILITIES; ++i) @@ -2174,7 +2174,7 @@ std::vector<talent> your_talents( bool check_confused ) } // And finally, the ability to opt-out of your faith {dlb}: - if (you.religion != GOD_NO_GOD && !silenced( you.x_pos, you.y_pos )) + if (you.religion != GOD_NO_GOD && !silenced( you.pos() )) _add_talent(talents, ABIL_RENOUNCE_RELIGION, check_confused ); //jmf: Check for breath weapons -- they're exclusive of each other, I hope! |