Apply trunk r6900 to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6901 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 3 deletions

diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 9f656e95f6..d3806fd9ea 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -336,15 +336,20 @@ void handle_traps(trap_type trt, int i, bool trap_known)
     struct bolt beam;
 
     bool branchtype = false;
-    if (trap_category(trt) == DNGN_TRAP_MECHANICAL && trt != TRAP_NET
-        && trt != TRAP_BLADE)
+
+    // Mark traps as racial, if applicable.  See the list of racial
+    // restrictions in _determine_weapon_race() and
+    // _determine_missile_race() in makeitem.cc.
+    if (trap_category(trt) == DNGN_TRAP_MECHANICAL && trt != TRAP_BLADE
+        && trt != TRAP_NET)
     {
         if (you.where_are_you == BRANCH_ORCISH_MINES)
         {
             beam.name = "n orcish";
             branchtype = true;
         }
-        else if (you.where_are_you == BRANCH_ELVEN_HALLS)
+        else if (you.where_are_you == BRANCH_ELVEN_HALLS
+            && trt != TRAP_AXE && trt != TRAP_BOLT)
         {
             beam.name = "n elven";
             branchtype = true;