summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-ench.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-05-14 11:02:22 -0600
committerSteve Melenchuk <smelenchuk@gmail.com>2014-05-14 11:06:13 -0600
commit4b23974c7b712b463c05935ba0dc10b0ae5890d5 (patch)
tree673d6939bb86aeeb240baa169f2e64bfd52172f5 /crawl-ref/source/mon-ench.cc
parentf79658290cfba25e9b1108889a64994f933d6e1f (diff)
downloadcrawl-ref-4b23974c7b712b463c05935ba0dc10b0ae5890d5.tar.gz
crawl-ref-4b23974c7b712b463c05935ba0dc10b0ae5890d5.zip
Fix some more TAG_MAJOR_VERSION > 34 hiccups.
Diffstat (limited to 'crawl-ref/source/mon-ench.cc')
-rw-r--r--crawl-ref/source/mon-ench.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index b2da7ffb8b..89d9cfe21b 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -2195,17 +2195,24 @@ static const char *enchant_names[] =
"insane", "silenced", "awaken_forest", "exploding", "bleeding",
"tethered", "severed", "antimagic",
#if TAG_MAJOR_VERSION == 34
- "fading_away",
+ "fading_away", "preparing_resurrect",
#endif
- "preparing_resurrect", "regen",
+ "regen",
"magic_res", "mirror_dam", "stoneskin", "fear inspiring", "temporarily pacified",
"withdrawn", "attached", "guardian_timer", "flight",
"liquefying", "tornado", "fake_abjuration",
"dazed", "mute", "blind", "dumb", "mad", "silver_corona", "recite timer",
"inner_flame", "roused", "breath timer", "deaths_door", "rolling",
"ozocubus_armour", "wretched", "screamed", "rune_of_recall", "injury bond",
- "drowning", "flayed", "haunting", "retching", "weak", "dimension_anchor",
- "awaken vines", "control_winds", "wind_aided", "summon_capped",
+ "drowning", "flayed", "haunting",
+#if TAG_MAJOR_VERSION == 34
+ "retching",
+#endif
+ "weak", "dimension_anchor", "awaken vines", "control_winds",
+#if TAG_MAJOR_VERSION == 34
+ "wind_aided",
+#endif
+ "summon_capped",
"toxic_radiance", "grasping_roots_source", "grasping_roots",
"iood_charged", "fire_vuln", "tornado_cooldown", "siren_song",
"barbs",