Apply r6627, r6635, r6638 and r6645 (among others) to 0.4.

Fixes Selective Amnesia crash, claws/ankus in the weapon option, randart
bardings pretending to be boots and smaller stuff.
Includes indication of monsters seeing/sensing invisible.


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

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f3e9beee74..5d8ae48751 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -260,12 +260,16 @@ static int _str_to_weapon( const std::string &str )
         return (WPN_SHORT_SWORD);
     else if (str == "mace")
         return (WPN_MACE);
+    else if (str == "ankus")
+        return (WPN_ANKUS);
     else if (str == "spear")
         return (WPN_SPEAR);
     else if (str == "trident")
         return (WPN_TRIDENT);
     else if (str == "hand axe" || str == "handaxe")
         return (WPN_HAND_AXE);
+    else if (str == "unarmed" || str == "claws")
+        return (WPN_UNARMED);
     else if (str == "random")
         return (WPN_RANDOM);
 
@@ -280,12 +284,16 @@ std::string weapon_to_str( int weapon )
         return "short sword";
     case WPN_MACE:
         return "mace";
+    case WPN_ANKUS:
+        return "ankus";
     case WPN_SPEAR:
         return "spear";
     case WPN_TRIDENT:
         return "trident";
     case WPN_HAND_AXE:
         return "hand axe";
+    case WPN_UNARMED:
+        return "claws";
     case WPN_RANDOM:
     default:
         return "random";