Merge branch 'AlexK-misc'

* AlexK-misc:
  erosion is not being removed after reading non-cursed scroll of enchant weapon
This commit is contained in:
Derek S. Ray
2015-05-09 14:34:16 -04:00

View File

@@ -1282,7 +1282,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
hcolor(scursed ? NH_PURPLE : NH_GOLDEN), hcolor(scursed ? NH_PURPLE : NH_GOLDEN),
scursed ? "glow" : "shield"); scursed ? "glow" : "shield");
} }
if (uwep->oerodeproof && (uwep->oeroded || uwep->oeroded2)) { if (new_erodeproof && (uwep->oeroded || uwep->oeroded2)) {
uwep->oeroded = uwep->oeroded2 = 0; uwep->oeroded = uwep->oeroded2 = 0;
pline("%s as good as new!", pline("%s as good as new!",
Yobjnam2(uwep, Blind ? "feel" : "look")); Yobjnam2(uwep, Blind ? "feel" : "look"));