summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_item.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2012-11-07 23:10:57 +0000
committerChris Campbell <chriscampbell89@gmail.com>2012-11-07 23:10:57 +0000
commit4d198fdca39795ba784ef4a72ae78b1dc9643f14 (patch)
tree9377a488907a9ab79fded496875c5c5142c0cd6a /crawl-ref/source/l_item.cc
parentc270398da9427573da54500ead6498ceb014de0b (diff)
downloadcrawl-ref-4d198fdca39795ba784ef4a72ae78b1dc9643f14.tar.gz
crawl-ref-4d198fdca39795ba784ef4a72ae78b1dc9643f14.zip
Replace levitation with flight and remove controlled flight (elliott)
Diffstat (limited to 'crawl-ref/source/l_item.cc')
-rw-r--r--crawl-ref/source/l_item.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc
index ebd99c7133..c6b7371c0b 100644
--- a/crawl-ref/source/l_item.cc
+++ b/crawl-ref/source/l_item.cc
@@ -287,7 +287,7 @@ static const char *ring_types[] =
"intelligence",
"wizardry",
"magical power",
- "levitation",
+ "flight",
"life protection",
"protection from magic",
"fire",
@@ -298,7 +298,11 @@ static const char *ring_types[] =
static const char *amulet_types[] =
{
"rage", "clarity", "warding", "resist corrosion",
- "gourmand", "conservation", "controlled flight", "inaccuracy",
+ "gourmand", "conservation",
+#if TAG_MAJOR_VERSION == 34
+ "controlled flight",
+#endif
+ "inaccuracy",
"resist mutation", "guardian spirit", "faith", "stasis",
};