summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 14:24:50 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 14:24:50 +0000
commit9876ce66bfd29003796a8182b20696e57fe7add5 (patch)
treeecff8a89b72e683208e92897ee51356bc507b911 /crawl-ref/source/fight.cc
parent8f709e97f1d6483880922ba7c3a902c24c35c90b (diff)
downloadcrawl-ref-9876ce66bfd29003796a8182b20696e57fe7add5.tar.gz
crawl-ref-9876ce66bfd29003796a8182b20696e57fe7add5.zip
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6243 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 11102b8cd7..52be3c7d62 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1444,13 +1444,8 @@ int melee_attack::player_apply_weapon_bonuses(int damage)
}
// Demonspawn get a damage bonus for demonic weapons.
- if (you.species == SP_DEMONSPAWN
- && (weapon->sub_type == WPN_DEMON_BLADE
- || weapon->sub_type == WPN_DEMON_WHIP
- || weapon->sub_type == WPN_DEMON_TRIDENT))
- {
+ if (you.species == SP_DEMONSPAWN && is_demonic(*weapon))
damage += random2(3);
- }
}
return (damage);