Fix: reactivate offhand weapon intrinsics when catching a returning weapon

When catching Mjollnir/Xiuhcoatl/boomerangs/etc., make sure granted extrinsics/artifact light/etc. from the offhand weapon are also reinstated.

Author: saltwaterterrapin

doc/evilhack-changelog.md

@@ -3381,3 +3381,4 @@ The following changes to date are:
 - Fix: monster casting summon minion against another monster
 - Fix: spec_applies didn't consider if target was underwater
 - Fix: monster priests shouldn't wield edged weapons either
+- Fix: reactivate offhand weapon intrinsics when catching a returning weapon

src/dothrow.c

@@ -1419,7 +1419,11 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
             if (obj->owornmask & W_QUIVER) /* in case addinv() autoquivered */
                 setuqwep((struct obj *) 0);
             setuwep(obj);
-            u.twoweap = twoweap;
+            if (twoweap) {
+                u.twoweap = 1;
+                setuswapwep(uswapwep);
+                update_inventory();
+            }
             if (artifact_light(obj) && !obj->lamplit) {
                 begin_burn(obj, FALSE);
                 if (!Blind)
@@ -1450,8 +1454,11 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
             (void) encumber_msg();
             if (wep_mask && !(obj->owornmask & wep_mask)) {
                 setworn(obj, wep_mask);
-                /* moot; can no longer two-weapon with missile(s) */
-                u.twoweap = twoweap;
+                if (twoweap) {
+                    u.twoweap = 1;
+                    setuswapwep(uswapwep);
+                    update_inventory();
+                }
             }
             clear_thrownobj = TRUE;
             goto throwit_return;
@@ -1635,7 +1642,11 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
                     if (obj->owornmask & W_QUIVER)
                         setuqwep((struct obj *) 0);
                     setuwep(obj);
-                    u.twoweap = twoweap;
+                    if (twoweap) {
+                        u.twoweap = 1;
+                        setuswapwep(uswapwep);
+                        update_inventory();
+                    }
                     retouch_object(&obj, !uarmg, TRUE);
                     if (artifact_light(obj) && !obj->lamplit) {
                         begin_burn(obj, FALSE);