diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-25 20:11:39 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-25 20:11:39 +0000 |
| commit | 0f4fad723ed09e496c5935d9a74afbefd3b42505 (patch) | |
| tree | 0a8c5b5b0cdf9c1866df43d09c1e97f4a85630bb /crawl-ref | |
| parent | 7ce53143a6ea781bb9bd2eb29995c6d160331328 (diff) | |
| download | crawl-ref-0f4fad723ed09e496c5935d9a74afbefd3b42505.tar.gz crawl-ref-0f4fad723ed09e496c5935d9a74afbefd3b42505.zip | |
Refixed stubbed SP_ELF (Haran).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1655 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/skills2.cc | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 5c4eac3dbe..6452a0c2fd 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -3225,7 +3225,6 @@ enum special_wield_type // you.special_wield enum species_type { SP_HUMAN = 1, // 1 - SP_ELF, // (placeholder) SP_HIGH_ELF, SP_GREY_ELF, SP_DEEP_ELF, // 5 @@ -3261,6 +3260,7 @@ enum species_type SP_GHOUL, // 35 SP_KENKU, SP_MERFOLK, + SP_ELF, // (placeholder) NUM_SPECIES, // always after the last species SP_UNKNOWN = 100 diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 5df33ee42a..6bb4b85c49 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2963,7 +2963,8 @@ spec_query: *linebuf = 0; for (int i = SP_HUMAN; i < NUM_SPECIES; ++i) { - if (i > SP_RED_DRACONIAN && i <= SP_BASE_DRACONIAN) + if ((i > SP_RED_DRACONIAN && i <= SP_BASE_DRACONIAN) + || i == SP_ELF) continue; if (you.char_class != JOB_UNKNOWN && diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 2f3507eb17..0b9aac8af2 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -1674,6 +1674,9 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, + // SP_ELF placeholder. + { + }, /* ****************************************************** |