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/itemname.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/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index a756edc948..e4817fcfca 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -462,7 +462,7 @@ const char* weapon_brand_name(const item_def& item, bool terse, int override_bra case SPWPN_DISTORTION: return terse ? "distort" : "distortion"; case SPWPN_REAPING: return terse ? "reap" : "reaping"; - case SPWPN_VAMPIRICISM: + case SPWPN_VAMPIRISM: return terse ? "vamp" : ""; // non-terse already handled case SPWPN_VORPAL: @@ -1229,8 +1229,8 @@ string ego_type_string(const item_def &item, bool terse, int override_brand) : get_weapon_brand(item); // this is specialcased out of weapon_brand_name // ("vampiric hand axe", etc) - if (checkbrand == SPWPN_VAMPIRICISM) - return "vampiricism"; + if (checkbrand == SPWPN_VAMPIRISM) + return "vampirism"; else if (checkbrand == SPWPN_ANTIMAGIC) return "antimagic"; } @@ -1361,7 +1361,7 @@ string item_def::name_aux(description_level_type desc, bool terse, bool ident, if (know_brand && !terse) { int brand = get_weapon_brand(*this); - if (brand == SPWPN_VAMPIRICISM) + if (brand == SPWPN_VAMPIRISM) buff << "vampiric "; else if (brand == SPWPN_ANTIMAGIC) buff << "antimagic "; |