diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-13 14:07:56 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-13 14:07:56 +0000 |
| commit | 2a9689ff31d9b420120db477c7121e6d3fa114f3 (patch) | |
| tree | 82dbbeaf538857dedeee03d2e871f572f1cf5c45 /crawl-ref/source/fight.cc | |
| parent | 0cac1ce29227a7352540e9b3479db5b3fc8f55d6 (diff) | |
| download | crawl-ref-2a9689ff31d9b420120db477c7121e6d3fa114f3.tar.gz crawl-ref-2a9689ff31d9b420120db477c7121e6d3fa114f3.zip | |
Clean up holiness handling, as well as a few other miscellaneous things.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3621 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index edb1071324..c9537034ff 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1918,16 +1918,12 @@ bool melee_attack::apply_damage_brand() break; case SPWPN_HOLY_WRATH: - switch (defender->holiness()) + if (defender->holiness() == MH_UNDEAD || + defender->holiness() == MH_DEMONIC) { - case MH_UNDEAD: - case MH_DEMONIC: special_damage = 1 + (random2(damage_done * 15) / 10); - break; - - default: - break; } + if (special_damage && defender_visible) { special_damage_message = |