summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ng-restr.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-05-29 04:01:42 +0200
committerAdam Borowski <kilobyte@angband.pl>2013-05-29 04:01:42 +0200
commitaff44e3dcf63bf0a5426c8d6998c8954bb44d26d (patch)
tree1708e320052e6631f93e85301ff6d2ad75ebb1ef /crawl-ref/source/ng-restr.cc
parent30cd027a1c26d7375360584f5df8ec9f57a09c85 (diff)
parent1ef5305b68a6936247e5ee2a4aa7516222258490 (diff)
downloadcrawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.tar.gz
crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.zip
Merge branch 'master' into lava_orcs
Diffstat (limited to 'crawl-ref/source/ng-restr.cc')
-rw-r--r--crawl-ref/source/ng-restr.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index bd8ed1594e..e7fc125bfc 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -23,7 +23,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
case SP_DEEP_ELF:
case SP_SLUDGE_ELF:
case SP_MERFOLK:
- case SP_HALFLING:
case SP_KOBOLD:
case SP_SPRIGGAN:
case SP_NAGA:
@@ -276,19 +275,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
{
case SP_SLUDGE_ELF:
case SP_DEEP_DWARF:
- case SP_HILL_ORC:
case SP_LAVA_ORC:
case SP_MERFOLK:
case SP_HALFLING:
case SP_KOBOLD:
- case SP_SPRIGGAN:
case SP_CENTAUR:
case SP_OGRE:
case SP_TROLL:
case SP_MINOTAUR:
case SP_GHOUL:
case SP_VAMPIRE:
- case SP_FELID:
return CC_RESTRICTED;
default:
return CC_UNRESTRICTED;