polymorph into a non-twoweapon form

- you can't twoweapon unless your form allows it, but polymorph wouldn't
disable twoweapon mode immediately

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 4a90a9e190c6be4993b8ba8959f6a855c6f10c8f..4b32346ca0791e44d2f332627b04b4ee09037bca 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -33,6 +33,8 @@ if an unknown rolling boulder trap kills a monster, you shouldn't be a murderer
 touchstone entry in data.base
 specific message for engraving headstone with wand of digging
 wielded/quivered chained ball should be unwielded when thrown
+polymorphing into a form that cannot twoweapon should immediately disable
+       twoweapon mode
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/polyself.c b/src/polyself.c
index abcd7e9f3909785f7be12b7ea9ec5eed00823586..c909a50ecc401d08c716e0c64cfc93c947e31c8d 100644 (file)
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -668,6 +668,8 @@ int alone;
                    dropx(otmp2);
            }
            untwoweapon();
+       } else if (!could_twoweap(youmonst.data)) {
+           untwoweapon();
        }
     }
 }