diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:01:42 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:01:42 +0200 |
| commit | aff44e3dcf63bf0a5426c8d6998c8954bb44d26d (patch) | |
| tree | 1708e320052e6631f93e85301ff6d2ad75ebb1ef /crawl-ref/source/newgame.cc | |
| parent | 30cd027a1c26d7375360584f5df8ec9f57a09c85 (diff) | |
| parent | 1ef5305b68a6936247e5ee2a4aa7516222258490 (diff) | |
| download | crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.tar.gz crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.zip | |
Merge branch 'master' into lava_orcs
Diffstat (limited to 'crawl-ref/source/newgame.cc')
| -rw-r--r-- | crawl-ref/source/newgame.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 27dc549abe..4a77839501 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -162,7 +162,7 @@ static bool _is_species_valid_choice(species_type species) return false; if (species == SP_LAVA_ORC - && Version::ReleaseType() != VER_ALPHA) + && Version::ReleaseType != VER_ALPHA) { return false; } @@ -180,6 +180,11 @@ static bool _is_job_valid_choice(job_type job) if (job < 0 || job > NUM_JOBS) return false; +#if TAG_MAJOR_VERSION == 34 + if (job == JOB_STALKER || job == JOB_JESTER) + return false; +#endif + return true; } @@ -1298,7 +1303,7 @@ static void _prompt_job(newgame_def* ng, newgame_def* ng_choice, return; case M_HELP: // access to the help files - list_commands('1'); + list_commands('2'); return _prompt_job(ng, ng_choice, defaults); case M_APTITUDES: list_commands('%', false, _highlight_pattern(ng)); |