summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/item_use.cc6
-rw-r--r--crawl-ref/source/itemname.cc2
-rw-r--r--crawl-ref/source/itemprop.h2
-rw-r--r--crawl-ref/source/makeitem.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index ba0e2271a7..5d316159bb 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4262,7 +4262,7 @@ static bool _scroll_modify_item(item_def scroll)
return (false);
}
-static void _antimagic_scroll()
+static void _vulnerability_scroll()
{
// First cast antimagic on yourself.
antimagic();
@@ -4657,8 +4657,8 @@ void read_scroll(int slot)
break;
}
- case SCR_ANTIMAGIC:
- _antimagic_scroll();
+ case SCR_VULNERABILITY:
+ _vulnerability_scroll();
break;
default:
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 2ae8e1a8a0..ccbc250be7 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -551,7 +551,7 @@ static const char* scroll_type_name(int scrolltype)
case SCR_RECHARGING: return "recharging";
case SCR_ENCHANT_WEAPON_III: return "enchant weapon III";
case SCR_HOLY_WORD: return "holy word";
- case SCR_ANTIMAGIC: return "antimagic";
+ case SCR_VULNERABILITY: return "vulnerability";
default: return "bugginess";
}
}
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index aae23b1768..d17a48510d 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -318,7 +318,7 @@ enum scroll_type
SCR_RECHARGING,
SCR_ENCHANT_WEAPON_III,
SCR_HOLY_WORD,
- SCR_ANTIMAGIC,
+ SCR_VULNERABILITY,
NUM_SCROLLS
};
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index cedc817167..cc3f1a101d 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2403,7 +2403,7 @@ static void _generate_scroll_item(item_def& item, int force_type,
160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ACQUIREMENT),
160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ENCHANT_WEAPON_III),
160, (depth_mod < 4 ? SCR_DETECT_CURSE : SCR_SUMMONING),
- 160, (depth_mod < 4 ? SCR_PAPER : SCR_ANTIMAGIC),
+ 160, (depth_mod < 4 ? SCR_PAPER : SCR_VULNERABILITY),
// High-level scrolls
160, (depth_mod < 7 ? SCR_TELEPORTATION : SCR_VORPALISE_WEAPON),