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

polymorph dropping in-use wielded leash part 2

Browse Source 
forgot to handle the twoweapon case, and messed up the test logic (which
appeared to work in previous, incomplete testing)
This commit is contained in:
cohrs
2007-02-12 21:40:16 +00:00
parent 5c3651e055
commit 2fde3bce8e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/polyself.c
View File

@@ -737,11 +737,12 @@ int alone;
otmp2 = u.twoweap ? uswapwep : 0; otmp2 = u.twoweap ? uswapwep : 0;
uwepgone(); uwepgone();
if ((!wep->cursed || wep->otyp != LOADSTONE) && if ((!wep->cursed || wep->otyp != LOADSTONE) &&
(wep->otyp != LEASH && wep->leashmon != 0)) (wep->otyp != LEASH || wep->leashmon == 0))
dropx(otmp); dropx(otmp);
if (otmp2 != 0) { if (otmp2 != 0) {
uswapwepgone(); uswapwepgone();
if (!otmp2->cursed || otmp2->otyp != LOADSTONE) if ((!otmp2->cursed || otmp2->otyp != LOADSTONE) &&
(otmp2->otyp != LEASH || otmp2->leashmon == 0))
dropx(otmp2); dropx(otmp2);
} }
untwoweapon(); untwoweapon();