Unify impaired movement direction checks

2022-07-17 12:23:49 +03:00
parent 1ae2bc7063
commit 6fe0f7c132
5 changed files with 22 additions and 16 deletions
--- a/src/apply.c
+++ b/src/apply.c
@@ -355,8 +355,7 @@ use_stethoscope(struct obj *obj)
        You_hear("your heart beat.");
        return res;
    }
-    if (Stunned || (Confusion && !rn2(5)))
-        confdir();
+    confdir(FALSE);
    if (!u.dx && !u.dy) {
        ustatusline();
        return res;
@@ -2850,8 +2849,7 @@ use_whip(struct obj *obj)
        rx = mtmp->mx;
        ry = mtmp->my;
    } else {
-        if (Stunned || (Confusion && !rn2(5)))
-            confdir();
+        confdir(FALSE);
        rx = u.ux + u.dx;
        ry = u.uy + u.dy;
        if (!isok(rx, ry)) {