diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 08:34:11 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 08:34:11 +0530 |
| commit | d85ce5fca3ae674e2437783a358dfc3eecd38a3c (patch) | |
| tree | cb22f120b5c10e18bff5493f7e51d1117fcbb200 /crawl-ref/source/enum.h | |
| parent | 22c9c1dd3fe93c8ccab01eec647fb002877018f8 (diff) | |
| download | crawl-ref-d85ce5fca3ae674e2437783a358dfc3eecd38a3c.tar.gz crawl-ref-d85ce5fca3ae674e2437783a358dfc3eecd38a3c.zip | |
s/merfolk elementalist/merfolk aquamancer/ (sorear).
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 4 |
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, |