diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-11 07:19:31 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-11 07:19:31 +0000 |
| commit | 62492a08d2f1f53f02bbfbcf604bce6418d956f0 (patch) | |
| tree | 0aa6295732a446beb6b444c7e1731e7d2c5f4ecf /crawl-ref/source/abl-show.cc | |
| parent | e65d4ee999e6673244c26ae7278665d6fe241a5e (diff) | |
| download | crawl-ref-62492a08d2f1f53f02bbfbcf604bce6418d956f0.tar.gz crawl-ref-62492a08d2f1f53f02bbfbcf604bce6418d956f0.zip | |
1835314: Nemelex abilities work when silenced.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5730 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 0eca049174..c462265d16 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -2093,15 +2093,18 @@ std::vector<talent> your_talents( bool check_confused ) _add_talent(talents, ABIL_TROG_BURN_BOOKS, check_confused ); // Gods take abilities away until penance completed. -- bwr - if (!player_under_penance() && !silenced( you.x_pos, you.y_pos )) + // 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) + || you.religion == GOD_NEMELEX_XOBEH)) { for ( int i = 0; i < MAX_GOD_ABILITIES; ++i ) { if ( you.piety >= piety_breakpoint(i) ) { - ability_type abil = god_abilities[you.religion][i]; + const ability_type abil = god_abilities[you.religion][i]; if ( abil != ABIL_NON_ABILITY ) - _add_talent(talents,abil, check_confused); + _add_talent(talents, abil, check_confused); } } } |