Allow the weapon enchantment blessing tp work on a monster's alternate

weapon.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4562 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 11 insertions, 2 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 444b4096ca..c16c26c2c9 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -797,13 +797,22 @@ static bool _blessing_wpn(monsters *mon)
 {
     // Pick a monster's weapon.
     const int weapon = mon->inv[MSLOT_WEAPON];
+    const int alt_weapon = mon->inv[MSLOT_ALT_WEAPON];
 
-    if (weapon == NON_ITEM)
+    if (weapon == NON_ITEM && alt_weapon == NON_ITEM)
         return false;
 
     bool success;
 
-    item_def& wpn(mitm[weapon]);
+    int slot;
+
+    do
+    {
+        slot = (coinflip()) ? weapon : alt_weapon;
+    }
+    while (slot == NON_ITEM);
+
+    item_def& wpn(mitm[slot]);
 
     // And enchant or uncurse it.
     success = enchant_weapon((coinflip()) ? ENCHANT_TO_HIT