diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-21 03:57:31 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-21 03:57:31 +0000 |
| commit | 8a71071e3d9dd698f31846f2261e5b77ca7085c8 (patch) | |
| tree | 6aa1c6e81a2d8e4accc556597d9642ac5b2e10f7 /crawl-ref/source/acr.cc | |
| parent | 0e1304a15a7c5fd3a5dbe3b24f4722aeef8578f2 (diff) | |
| download | crawl-ref-8a71071e3d9dd698f31846f2261e5b77ca7085c8.tar.gz crawl-ref-8a71071e3d9dd698f31846f2261e5b77ca7085c8.zip | |
Change the spell_type enumerations so that SPELL_NO_SPELL is 0 and the first
valid spell (Identify) is 1. This way any bug that causes a spell_type
variable to be 0 will be recognized as an invalid spell.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7892 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 748f1a58d2..f8b9d9572f 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -4549,13 +4549,12 @@ static void _compile_time_asserts() COMPILE_CHECK(SK_UNARMED_COMBAT == 19 , c1); COMPILE_CHECK(SK_EVOCATIONS == 39 , c2); COMPILE_CHECK(SP_VAMPIRE == 33 , c3); - COMPILE_CHECK(SPELL_BOLT_OF_MAGMA == 18 , c4); + COMPILE_CHECK(SPELL_BOLT_OF_MAGMA == 19 , c4); COMPILE_CHECK(SPELL_POISON_ARROW == 94 , c5); COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 223 , c6); //jmf: NEW ASSERTS: we ought to do a *lot* of these - COMPILE_CHECK(NUM_SPELLS < SPELL_NO_SPELL , c7); - COMPILE_CHECK(NUM_JOBS < JOB_UNKNOWN , c8); + COMPILE_CHECK(NUM_JOBS < JOB_UNKNOWN , c7); // Also some runtime stuff; I don't know if the order of branches[] // needs to match the enum, but it currently does. |