Fix 2024087: @_generic_orc_speech@.

Fix 2024560: Selective Amnesia crash.
Fix 2024701: claws/ankus not being handled in the weapon options.

Implement 2025076: give an indication of monsters seeing/sensing
invisible in their description.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6638 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 947065149b..503f2911f1 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -261,12 +261,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);
 
@@ -281,12 +285,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";