From: SHIRAKATA Kentaro <argrath@ub32.org>
Date: Sun, 26 Jun 2022 13:58:05 +0000 (+0900)
Subject: split "letknow" into separate function
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3b09bca5aedf5f3c19652d3de072418070a6adc;p=nethack

split "letknow" into separate function
---

diff --git a/src/vault.c b/src/vault.c
index 9e14fae23..eda5b47e3 100644
--- a/src/vault.c
+++ b/src/vault.c
@@ -16,6 +16,7 @@ static void wallify_vault(struct monst *);
 static void gd_mv_monaway(struct monst *, int, int);
 static void gd_pick_corridor_gold(struct monst *, int, int);
 static int gd_move_cleanup(struct monst *, boolean, boolean);
+static void gd_letknow(struct monst *);
 
 void
 newegd(struct monst *mtmp)
@@ -805,6 +806,22 @@ gd_move_cleanup(
     return -2;
 }
 
+static void
+gd_letknow(struct monst *grd)
+{
+    if (!cansee(grd->mx, grd->my) || !mon_visible(grd))
+        You_hear("%s.",
+                    m_carrying(grd, TIN_WHISTLE)
+                        ? "the shrill sound of a guard's whistle"
+                        : "angry shouting");
+    else
+        You(um_dist(grd->mx, grd->my, 2)
+                ? "see %s approaching."
+                : "are confronted by %s.",
+            /* "an angry guard" */
+            x_monnam(grd, ARTICLE_A, "angry", 0, FALSE));
+}
+
 /*
  * return  1: guard moved,  0: guard didn't,  -1: let m_move do it,  -2: died
  */
@@ -844,7 +861,8 @@ gd_move(struct monst *grd)
             wallify_vault(grd);
             if (!in_fcorridor(grd, grd->mx, grd->my))
                 (void) clear_fcorr(grd, TRUE);
-            goto letknow;
+            gd_letknow(grd);
+            return -1;
         }
         if (!in_fcorridor(grd, grd->mx, grd->my))
             (void) clear_fcorr(grd, TRUE);
@@ -899,18 +917,7 @@ gd_move(struct monst *grd)
                 levl[m][n].flags = egrd->fakecorr[0].flags;
                 newsym(m, n);
                 grd->mpeaceful = 0;
- letknow:
-                if (!cansee(grd->mx, grd->my) || !mon_visible(grd))
-                    You_hear("%s.",
-                             m_carrying(grd, TIN_WHISTLE)
-                                 ? "the shrill sound of a guard's whistle"
-                                 : "angry shouting");
-                else
-                    You(um_dist(grd->mx, grd->my, 2)
-                            ? "see %s approaching."
-                            : "are confronted by %s.",
-                        /* "an angry guard" */
-                        x_monnam(grd, ARTICLE_A, "angry", 0, FALSE));
+                gd_letknow(grd);
                 return -1;
             } else {
                 if (!Deaf)