More unpolyable unifying

... and fix the potion dipping case.
2020-11-17 18:00:40 +02:00
parent 03d1eed0b5
commit e100d1a137
3 changed files with 13 additions and 6 deletions
--- a/src/potion.c
+++ b/src/potion.c
@@ -1977,11 +1977,7 @@ dodip()
            goto poof;
    } else if (obj->otyp == POT_POLYMORPH || potion->otyp == POT_POLYMORPH) {
        /* some objects can't be polymorphed */
-        if (obj->otyp == potion->otyp /* both POT_POLY */
-            || unpolyable(obj)
-            || obj == uball || obj == uskin
-            || obj_resists(obj->otyp == POT_POLYMORPH ? potion : obj,
-                           5, 95)) {
+        if (obj_unpolyable(obj->otyp == POT_POLYMORPH ? potion : obj)) {
            pline1(nothing_happens);
        } else {
            short save_otyp = obj->otyp;