From 1688c75b9f97b24830f4e724c0fc91bf478af6bf Mon Sep 17 00:00:00 2001
From: cohrs <cohrs>
Date: Sat, 30 Mar 2002 03:01:38 +0000
Subject: [PATCH] polymorph into a non-twoweapon form - you can't twoweapon
 unless your form allows it, but polymorph wouldn't disable twoweapon mode
 immediately

---
 doc/fixes34.1  | 2 ++
 src/polyself.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 4a90a9e19..4b32346ca 100644
--- 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 abcd7e9f3..c909a50ec 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -668,6 +668,8 @@ int alone;
 		    dropx(otmp2);
 	    }
 	    untwoweapon();
+	} else if (!could_twoweap(youmonst.data)) {
+	    untwoweapon();
 	}
     }
 }
-- 
2.40.0