Unify ad_wrap

2020-11-30 22:06:53 +02:00
parent bfb8931188
commit 7914237fbf
4 changed files with 87 additions and 59 deletions
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -1250,9 +1250,10 @@ int dieroll;
        if (mhm.done)
            return mhm.hitflags;
        break;
-    case AD_WRAP: /* monsters cannot grab one another, it's too hard */
-        if (magr->mcan)
-            mhm.damage = 0;
+    case AD_WRAP:
+        mhitm_ad_wrap(magr, mattk, mdef, &mhm);
+        if (mhm.done)
+            return mhm.hitflags;
        break;
    case AD_ENCH:
        /* there's no msomearmor() function, so just do damage */