diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 22:36:56 -0600 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 22:36:56 -0600 |
commit | 8ae09e1699c95d66263264540e13d09fcac63f59 (patch) | |
tree | d1e184cffa90f8f7fe49f892ff609ee7f5aef8b6 /crawl-ref | |
parent | cbf5fe7b39f4ae734ba7b596b8a1c17264f797ea (diff) | |
download | crawl-ref-8ae09e1699c95d66263264540e13d09fcac63f59.tar.gz crawl-ref-8ae09e1699c95d66263264540e13d09fcac63f59.zip |
Clean up a few references to holy scourges.
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/shopping.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index f058c4e03b..21b6e50c53 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -996,8 +996,8 @@ unsigned int item_value( item_def item, bool ident ) case WPN_BLESSED_DOUBLE_SWORD: case WPN_BLESSED_GREAT_SWORD: case WPN_BLESSED_TRIPLE_SWORD: - case WPN_LAJATANG: case WPN_HOLY_SCOURGE: + case WPN_LAJATANG: valued += 200; break; } diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 6c68e3e904..92d9df5df5 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1326,7 +1326,7 @@ static int _tileidx_weapon_base(const item_def &item) return TILE_WPN_TRIPLE_SWORD; case WPN_HOLY_SCOURGE: - return TILE_WPN_WHIP; + return TILE_WPN_DEMON_WHIP; } return TILE_ERROR; @@ -3730,6 +3730,8 @@ int tilep_equ_weapon(const item_def &item) case WPN_ANKUS: return TILEP_HAND1_MACE; case WPN_WHIP: return TILEP_HAND1_WHIP; case WPN_DEMON_WHIP: return TILEP_HAND1_BLACK_WHIP; + // new blessed weapons + case WPN_HOLY_SCOURGE: return TILEP_HAND1_BLACK_WHIP; // Edge case WPN_KNIFE: return TILEP_HAND1_DAGGER_SLANT; |