diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 18:14:33 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 18:14:33 +0000 |
| commit | a6cc69a168056e0f11ac171b35d52d31f3aca8bb (patch) | |
| tree | c9baa6de76ae957c166efbe6c0d4bbdc66670966 /crawl-ref/source/fight.cc | |
| parent | c9af2ce66265871a81fd71f5071220922d284491 (diff) | |
| download | crawl-ref-a6cc69a168056e0f11ac171b35d52d31f3aca8bb.tar.gz crawl-ref-a6cc69a168056e0f11ac171b35d52d31f3aca8bb.zip | |
Remove "#define SPWPN_FOOBAR UNRAND_FOOBAR" backwards compatibility for
fixed-art brand_type enumerations.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10041 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 2af9d86542..9657d2e40e 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1887,9 +1887,9 @@ void melee_attack::player_check_weapon_effects() { switch (weapon->special) { - case SPWPN_SCEPTRE_OF_ASMODEUS: - case SPWPN_STAFF_OF_DISPATER: - case SPWPN_SWORD_OF_CEREBOV: + case UNRAND_ASMODEUS: + case UNRAND_DISPATER: + case UNRAND_CEREBOV: did_god_conduct(DID_UNHOLY, 3); break; default: @@ -2112,7 +2112,7 @@ void melee_attack::calc_elemental_brand_damage( beam_type flavour, int melee_attack::fire_res_apply_cerebov_downgrade(int res) { - if (weapon && weapon->special == SPWPN_SWORD_OF_CEREBOV) + if (weapon && weapon->special == UNRAND_CEREBOV) --res; return (res); @@ -3103,7 +3103,6 @@ bool melee_attack::apply_damage_brand() break; case SPWPN_VENOM: - case SPWPN_STAFF_OF_OLGREB: if (!one_chance_in(4)) { int old_poison; @@ -3192,7 +3191,7 @@ bool melee_attack::apply_damage_brand() // Thus is probably more valuable on larger weapons? if (weapon && is_unrandom_artefact(*weapon) - && weapon->special == SPWPN_VAMPIRES_TOOTH) + && weapon->special == UNRAND_VAMPIRES_TOOTH) { hp_boost = damage_done; } |