summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/shopping.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-06-10 09:31:59 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-06-10 09:36:48 -0400
commitffd391d7850bbbc282688706f5714a885f07b182 (patch)
tree9ef1f9d7ee4e051216b42ee4dd5a782ea38e6209 /crawl-ref/source/shopping.cc
parent897c189157c822dcb87e64f4a38373bdd258e554 (diff)
downloadcrawl-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/shopping.cc')
-rw-r--r--crawl-ref/source/shopping.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index b1529b8bf2..1be6f2c411 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1078,10 +1078,8 @@ unsigned int item_value(item_def item, bool ident)
case SPWPN_CHAOS:
case SPWPN_DRAINING:
- case SPWPN_FLAME:
case SPWPN_FLAMING:
case SPWPN_FREEZING:
- case SPWPN_FROST:
case SPWPN_HOLY_WRATH:
valued *= 18;
break;