Fix: Giantslayer strength bonus not taken into account whilst twoweap…

…oning.

The player would still receive 25 strength when wielding Giantslayer in
either the primary or offhand while twoweaponing, but the maximum weight
restriction was not negated like it would be if wearing gauntlets of
power. So, adjust the check away from objects, and have it check the
players actual strength.

Snuck in a grammar fix as well.

doc/evilhack-changelog.md

@@ -3541,4 +3541,5 @@ The following changes to date are:
  another monster)
 - Fix: make autoall_menu apply to the 'D' drop menu as well as the loot menu
 - Fix: Your dagger also slips from your hand (but a knife was wielded)
+- Fix: Giantslayer strength bonus not taken into account whilst twoweaponing 
 

src/uhitm.c

@@ -517,8 +517,7 @@ register struct monst *mtmp;
  break;
  }
 
- if ((uarmg && uarmg->otyp == GAUNTLETS_OF_POWER)
- || (uarmg && uarmg->oartifact == ART_HAND_OF_VECNA)
+ if (ACURR(A_STR) == STR19(25)
  || maybe_polyd(is_giant(youmonst.data), Race_if(PM_GIANT)))
  maxweight = 200;
 
@@ -527,7 +526,7 @@ register struct monst *mtmp;
  xname(uswapwep), uswapwep->quan == 1 ? "s" : "",
  rn2(2) ? "unwieldy" : "cumbersome");
  if (!rn2(10))
- Your("%s %s too heavy to effectively fight offhand with.",
+ Your("%s %s too heavy to fight offhand with effectively.",
  xname(uswapwep), uswapwep->quan == 1 ? "is" : "are");
  }
 

src/weapon.c

@@ -2054,8 +2054,7 @@ struct obj *weapon;
  }
 
  /* basically no restrictions if you're a giant, or have giant strength */
- if ((uarmg && uarmg->otyp == GAUNTLETS_OF_POWER)
- || (uarmg && uarmg->oartifact == ART_HAND_OF_VECNA)
+ if (ACURR(A_STR) == STR19(25)
  || maybe_polyd(is_giant(youmonst.data), Race_if(PM_GIANT)))
  maxweight = 200;