summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index bf570798f1..4d8acfc69a 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1822,7 +1822,7 @@ enum monster_type // (int) menv[].type
// Shoals guardians
MONS_MERFOLK_GLADIATOR,
- MONS_MERFOLK_ELEMENTALIST,
+ MONS_MERFOLK_AQUAMANCER,
//jmf: end new monsters
MONS_WHITE_IMP = 220, // 220
@@ -2325,7 +2325,7 @@ enum mon_spellbook_type
MST_HAROLD,
MST_MARA,
MST_MARA_FAKE,
- MST_MERFOLK_ELEMENTALIST,
+ MST_MERFOLK_AQUAMANCER,
MST_TEST_SPAWNER = 200,
NUM_MSTYPES,