nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

groundwork: u.twoweap manipulation

Browse Source 
Toggle u.twoweap on or off in just one place.
This commit is contained in:
PatR
2020-04-03 11:42:17 -07:00
parent d58e449d6c
commit 8f73f926b1
9 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dothrow.c
View File

@@ -1193,7 +1193,7 @@ struct obj *oldslot; /* for thrown-and-return used with !fixinv */
if (obj->owornmask & W_QUIVER) /* in case addinv() autoquivered */
setuqwep((struct obj *) 0);
setuwep(obj);
u.twoweap = twoweap;
set_twoweap(twoweap); /* u.twoweap = twoweap */
} else if (u.dz < 0) {
(void) toss_up(obj, rn2(5) && !Underwater);
} else if (u.dz > 0 && u.usteed && obj->oclass == POTION_CLASS
@@ -1217,7 +1217,7 @@ struct obj *oldslot; /* for thrown-and-return used with !fixinv */
(void) encumber_msg();
if (wep_mask && !(obj->owornmask & wep_mask)) {
setworn(obj, wep_mask);
u.twoweap = twoweap;
set_twoweap(twoweap); /* u.twoweap = twoweap */
}
clear_thrownobj = TRUE;
goto throwit_return;
@@ -1352,7 +1352,7 @@ struct obj *oldslot; /* for thrown-and-return used with !fixinv */
if (obj->owornmask & W_QUIVER)
setuqwep((struct obj *) 0);
setuwep(obj);
u.twoweap = twoweap;
set_twoweap(twoweap); /* u.twoweap = twoweap */
if (cansee(g.bhitpos.x, g.bhitpos.y))
newsym(g.bhitpos.x, g.bhitpos.y);
} else {