diff options
author | reaverb <reaverb.Crawl@gmail.com> | 2014-06-15 16:39:31 -0400 |
---|---|---|
committer | reaverb <reaverb.Crawl@gmail.com> | 2014-06-15 17:22:49 -0400 |
commit | e1f089e4d803acad323b702ff29d2f754c6d3641 (patch) | |
tree | bf5a644952ce47aa951c7b780959e0acb8f461d0 /crawl-ref/source/item_use.cc | |
parent | 073eae0ed26fb313dbd3aa0e2cf0a5fa207a1c12 (diff) | |
download | crawl-ref-e1f089e4d803acad323b702ff29d2f754c6d3641.tar.gz crawl-ref-e1f089e4d803acad323b702ff29d2f754c6d3641.zip |
Rename "vampiricism" to "vampirism" (ChrisOelmueller, #8435)
Chris Oelmueller made an excellent patch for this, but unfortunately it
was rather rotted by the time somebody decided to look at it. It was
easier to recreate than update. I've also added some tiles stuff which
was missed in the original patch.
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index e9dfe26b58..fcc5f344ec 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -182,7 +182,7 @@ bool can_wield(item_def *weapon, bool say_reason, } else if (!ignore_temporary_disability && you.hunger_state < HS_FULL - && get_weapon_brand(*weapon) == SPWPN_VAMPIRICISM + && get_weapon_brand(*weapon) == SPWPN_VAMPIRISM && !crawl_state.game_is_zotdef() && !you.is_undead && !you_foodless() @@ -2115,7 +2115,7 @@ static bool _god_hates_brand(const int brand) { if (is_good_god(you.religion) && (brand == SPWPN_DRAINING - || brand == SPWPN_VAMPIRICISM + || brand == SPWPN_VAMPIRISM || brand == SPWPN_CHAOS)) { return true; @@ -2170,7 +2170,7 @@ static void _rebrand_weapon(item_def& wpn) 15, SPWPN_VORPAL, 15, SPWPN_ELECTROCUTION, 12, SPWPN_PROTECTION, - 8, SPWPN_VAMPIRICISM, + 8, SPWPN_VAMPIRISM, 3, SPWPN_CHAOS, 0); } @@ -2210,7 +2210,7 @@ static void _brand_weapon(item_def &wpn) break; case SPWPN_DRAINING: - case SPWPN_VAMPIRICISM: + case SPWPN_VAMPIRISM: flash_colour = DARKGREY; mprf("%s thirsts for the lives of mortals!", itname.c_str()); break; |