diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-01-08 23:55:45 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-01-09 00:12:28 +0100 |
| commit | c38051949926584678c96920ff24702363eb9430 (patch) | |
| tree | 1792a175f3b997df847a817d0fa5f7a90b2fd6e2 /crawl-ref/source/skills2.h | |
| parent | 3bc6414c4bd564ff5774530ed5d456d81b72a38b (diff) | |
| parent | 2029ffc6c4a4383d1c6291cc1d0394ea16173059 (diff) | |
| download | crawl-ref-c38051949926584678c96920ff24702363eb9430.tar.gz crawl-ref-c38051949926584678c96920ff24702363eb9430.zip | |
Merge branch 'ench-split'.
Down with Enchantments, long live Charms and Hexes!
Diffstat (limited to 'crawl-ref/source/skills2.h')
| -rw-r--r-- | crawl-ref/source/skills2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/skills2.h b/crawl-ref/source/skills2.h index 1f68161995..628ffd03be 100644 --- a/crawl-ref/source/skills2.h +++ b/crawl-ref/source/skills2.h @@ -77,7 +77,7 @@ static const skill_type skill_display_order[] = SK_BLANK_LINE, - SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, SK_SUMMONINGS, + SK_SPELLCASTING, SK_CONJURATIONS, SK_HEXES, SK_CHARMS, SK_SUMMONINGS, SK_NECROMANCY, SK_TRANSLOCATIONS, SK_TRANSMUTATIONS, SK_FIRE_MAGIC, SK_ICE_MAGIC, SK_AIR_MAGIC, SK_EARTH_MAGIC, SK_POISON_MAGIC, |