summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/describe.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-11 17:12:07 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-11 17:12:07 +0530
commit40b5e8b46a50b9f3f23099983f3799534ff7e211 (patch)
tree088420d917e2d3bd1089f16bff71617b03653aca /crawl-ref/source/describe.cc
parent577f5d3f5ae46c69a2064405db110d6988a5c9a4 (diff)
parent00abd7f656ea920f8d69d57de0d5f2ecfd9a8f3a (diff)
downloadcrawl-ref-40b5e8b46a50b9f3f23099983f3799534ff7e211.tar.gz
crawl-ref-40b5e8b46a50b9f3f23099983f3799534ff7e211.zip
Merge branch 'amulet-refactoring'
Diffstat (limited to 'crawl-ref/source/describe.cc')
-rw-r--r--crawl-ref/source/describe.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index fc7a2f4d5c..83524b08da 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -144,7 +144,6 @@ const char* jewellery_base_ability_string(int subtype)
case RING_FIRE: return "Fire";
case RING_ICE: return "Ice";
case RING_TELEPORT_CONTROL: return "cTele";
- case AMU_RESIST_SLOW: return "rSlow";
case AMU_CLARITY: return "Clar";
case AMU_WARDING: return "Ward";
case AMU_RESIST_CORROSION: return "rCorr";
@@ -153,6 +152,8 @@ const char* jewellery_base_ability_string(int subtype)
case AMU_CONTROLLED_FLIGHT: return "cFly";
case AMU_RESIST_MUTATION: return "rMut";
case AMU_GUARDIAN_SPIRIT: return "Spirit";
+ case AMU_FAITH: return "Faith";
+ case AMU_STASIS: return "Stasis";
}
return "";
}