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/itemprop-enum.h | |
| 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/itemprop-enum.h')
| -rw-r--r-- | crawl-ref/source/itemprop-enum.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h index c9d0ec51d9..34aacf5145 100644 --- a/crawl-ref/source/itemprop-enum.h +++ b/crawl-ref/source/itemprop-enum.h @@ -86,8 +86,10 @@ enum brand_type // item_def.special SPWPN_DRAINING, SPWPN_SPEED, SPWPN_VORPAL, +#if TAG_MAJOR_VERSION == 34 SPWPN_FLAME, // ranged, only SPWPN_FROST, // ranged, only +#endif SPWPN_VAMPIRICISM, SPWPN_PAIN, SPWPN_ANTIMAGIC, |