diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-10 09:31:59 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-10 09:36:48 -0400 |
| commit | ffd391d7850bbbc282688706f5714a885f07b182 (patch) | |
| tree | 9ef1f9d7ee4e051216b42ee4dd5a782ea38e6209 /crawl-ref/source/ranged_attack.cc | |
| parent | 897c189157c822dcb87e64f4a38373bdd258e554 (diff) | |
| download | crawl-ref-ffd391d7850bbbc282688706f5714a885f07b182.tar.gz crawl-ref-ffd391d7850bbbc282688706f5714a885f07b182.zip | |
Combine the frost/flame and freezing/flaming brands.
Elec and venom launchers already use the same brands, and with ranged
code more similar to melee code this change actually simplifies most
code. There should be no gameplay change though some weird brand picking
code for launchers was refactored, which might have some effect.
Diffstat (limited to 'crawl-ref/source/ranged_attack.cc')
| -rw-r--r-- | crawl-ref/source/ranged_attack.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/ranged_attack.cc b/crawl-ref/source/ranged_attack.cc index e87955c9c3..6e03cbee38 100644 --- a/crawl-ref/source/ranged_attack.cc +++ b/crawl-ref/source/ranged_attack.cc @@ -422,8 +422,6 @@ bool ranged_attack::apply_damage_brand(const char *what) || brand == SPWPN_HOLY_WRATH || brand == SPWPN_ELECTROCUTION || brand == SPWPN_VENOM - || brand == SPWPN_FLAME - || brand == SPWPN_FROST || brand == SPWPN_CHAOS)) { return false; @@ -656,8 +654,7 @@ bool ranged_attack::apply_missile_brand() break; case SPMSL_FLAME: if (using_weapon() - && (get_weapon_brand(*weapon) == SPWPN_FROST - || get_weapon_brand(*weapon) == SPWPN_FREEZING)) + && get_weapon_brand(*weapon) == SPWPN_FREEZING) { break; } @@ -669,8 +666,7 @@ bool ranged_attack::apply_missile_brand() break; case SPMSL_FROST: if (using_weapon() - && (get_weapon_brand(*weapon) == SPWPN_FLAME - || get_weapon_brand(*weapon) == SPWPN_FLAMING)) + && get_weapon_brand(*weapon) == SPWPN_FLAMING) { break; } |