Merge branch 'master' into gargoyle_merge

Conflicts resolved:
	crawl-ref/source/enum.h
	crawl-ref/source/ng-restr.cc
	crawl-ref/source/player.cc
	crawl-ref/source/species.cc
	crawl-ref/source/tag-version.h

1 files changed, 27 insertions, 0 deletions

diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index 763dddd03f..4f2425f4d2 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -54,6 +54,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -73,6 +74,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_DEMIGOD:
         case SP_MUMMY:
         case SP_OCTOPODE:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -92,6 +94,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_VAMPIRE:
         case SP_OCTOPODE:
         case SP_GROTESK:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -124,6 +127,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_VAMPIRE:
         case SP_FELID:
         case SP_OCTOPODE:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -233,6 +237,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_KOBOLD:
         case SP_CENTAUR:
@@ -256,6 +261,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_HALFLING:
         case SP_KOBOLD:
@@ -274,6 +280,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_SLUDGE_ELF:
         case SP_DEEP_DWARF:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_HALFLING:
         case SP_KOBOLD:
@@ -295,6 +302,7 @@ 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_CENTAUR:
         case SP_OGRE:
         case SP_TROLL:
@@ -318,6 +326,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_HIGH_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_HALFLING:
         case SP_SPRIGGAN:
@@ -342,6 +351,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_OGRE:
         case SP_TROLL:
         case SP_MINOTAUR:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -394,6 +404,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_HALFLING:
         case SP_SPRIGGAN:
         case SP_CENTAUR:
@@ -402,6 +413,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MINOTAUR:
         case SP_TENGU:
         case SP_FELID:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -412,6 +424,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_CENTAUR:
         case SP_OGRE:
@@ -441,6 +454,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_VAMPIRE:
         case SP_FELID:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -452,6 +466,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_HIGH_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_HALFLING:
         case SP_CENTAUR:
         case SP_OGRE:
@@ -460,6 +475,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_VAMPIRE:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -474,6 +490,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_DEEP_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_NAGA:
         case SP_CENTAUR:
         case SP_OGRE:
@@ -485,6 +502,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_OCTOPODE:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -497,6 +515,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
             return CC_BANNED;
         case SP_DEEP_ELF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_SPRIGGAN:
         case SP_NAGA:
@@ -507,6 +526,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
+        case SP_DJINNI:
             return CC_RESTRICTED;
         default:
             return CC_UNRESTRICTED;
@@ -543,6 +563,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
             return CC_BANNED;
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_NAGA:
         case SP_TROLL:
@@ -628,6 +649,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_HUMAN:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MUMMY:
         case SP_CENTAUR:
         case SP_NAGA:
@@ -649,6 +671,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         {
         case SP_HUMAN:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_NAGA:
         case SP_OGRE:
@@ -681,6 +704,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         {
         case SP_HUMAN:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_NAGA:
         case SP_CENTAUR:
@@ -756,6 +780,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_MERFOLK:
         case SP_OGRE:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_SPRIGGAN:
         case SP_TROLL:
         case SP_SLUDGE_ELF:
@@ -775,6 +800,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_OGRE:
         case SP_TROLL:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_SLUDGE_ELF:
             return CC_RESTRICTED;
         case SP_FELID:
@@ -793,6 +819,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_MERFOLK:
         case SP_OGRE:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_TROLL:
             return CC_RESTRICTED;
         case SP_FELID: