diff options
author | Adam Borowski <kilobyte@angband.pl> | 2009-12-30 14:31:12 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-30 14:31:12 +0100 |
commit | d8190f4c633d2c4065e92c61894f85f506d5246a (patch) | |
tree | 887402a9869486e5a23386bc41dec9fae1987d39 /crawl-ref/source/main.cc | |
parent | 1d0cbf5f8be4dcb3d78167d3a1f29691779298f8 (diff) | |
parent | 30ad58ea18d6e4e2132d235e60f66f11131e17dc (diff) | |
download | crawl-ref-d8190f4c633d2c4065e92c61894f85f506d5246a.tar.gz crawl-ref-d8190f4c633d2c4065e92c61894f85f506d5246a.zip |
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/main.cc')
-rw-r--r-- | crawl-ref/source/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 7f3ccb2592..8b675c2770 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -4631,7 +4631,7 @@ static void _compile_time_asserts() COMPILE_CHECK(SP_VAMPIRE == 30 , c3); COMPILE_CHECK(SPELL_DEBUGGING_RAY == 103 , c4); COMPILE_CHECK(SPELL_RETURNING_AMMUNITION == 162 , c5); - COMPILE_CHECK(NUM_SPELLS == 216 , c6); + COMPILE_CHECK(NUM_SPELLS == 218 , c6); //jmf: NEW ASSERTS: we ought to do a *lot* of these COMPILE_CHECK(NUM_SPECIES < SP_UNKNOWN , c7); |