diff options
author | Adam Borowski <kilobyte@angband.pl> | 2013-11-01 18:24:42 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2013-11-01 18:24:42 +0100 |
commit | bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417 (patch) | |
tree | 2d4f6b41f802401ba3f76e9f71e03ad25efd71e1 /crawl-ref/source/ng-restr.cc | |
parent | 3bf288448a8a98d7f1b2db89711c778cf335b18c (diff) | |
parent | d201e361eac08bd032e84322fd2baef71ea63227 (diff) | |
download | crawl-ref-bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417.tar.gz crawl-ref-bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417.zip |
Merge branch 'master' into dwants
Diffstat (limited to 'crawl-ref/source/ng-restr.cc')
-rw-r--r-- | crawl-ref/source/ng-restr.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc index 600660d938..c39d29748d 100644 --- a/crawl-ref/source/ng-restr.cc +++ b/crawl-ref/source/ng-restr.cc @@ -15,6 +15,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job) { + if (!is_species_valid_choice(speci) || !is_job_valid_choice(job)) + return CC_BANNED; + switch (job) { case JOB_FIGHTER: @@ -565,7 +568,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job) default: return CC_UNRESTRICTED; } - case JOB_WANDERER: return CC_RESTRICTED; |