Merge branch 'master' into dwants

Conflicts:
	crawl-ref/source/dat/des/variable/mini_monsters.des
	crawl-ref/source/enum.h
	crawl-ref/source/itemprop.cc
	crawl-ref/source/main.cc
	crawl-ref/source/mutation-data.h
	crawl-ref/source/mutation.cc
	crawl-ref/source/newgame.cc
	crawl-ref/source/ng-restr.cc
	crawl-ref/source/rltiles/dc-player.txt
	crawl-ref/source/spl-selfench.cc
	crawl-ref/source/throw.cc
	crawl-ref/source/tilepick-p.cc
	crawl-ref/source/wiz-you.cc

1 files changed, 1 insertions, 27 deletions

diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index acecb21975..600660d938 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -830,37 +830,11 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
             return CC_UNRESTRICTED;
         }
 
-    case WPN_ROCKS:
-        switch (ng.species)
-        {
-        case SP_OGRE:
-        case SP_TROLL:
-        case SP_FORMICID:
-            return CC_UNRESTRICTED;
-        default:
-            return CC_BANNED;
-        }
-
-    case WPN_JAVELINS:
-        switch (ng.species)
-        {
-        case SP_DEEP_DWARF:
-        case SP_DJINNI:
-        case SP_FORMICID:
-            return CC_RESTRICTED;
-        case SP_SPRIGGAN:
-        case SP_FELID:
-            return CC_BANNED;
-        default:
-            return CC_UNRESTRICTED;
-        }
-
-    case WPN_DARTS:
+    case WPN_THROWN:
         switch (ng.species)
         {
         case SP_DEEP_DWARF:
         case SP_DJINNI:
-        case SP_FORMICID:
             return CC_RESTRICTED;
         case SP_FELID:
             return CC_BANNED;