known_branch_stairs

New routine known_branch_stairs() was performing two different things
and was unnecessarly complicated because of that.  Split off newer
routine stairs_description() to handle one of those.

diff --git a/include/extern.h b/include/extern.h
index 07aa255b445680743d28e8d59037c4fb81ab3842..7b0f65e788a9edaa313875127f150655b572b1c4 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -634,7 +634,8 @@ extern unsigned int induced_align(int);
 extern boolean Invocation_lev(d_level *);
 extern xchar level_difficulty(void);
 extern schar lev_by_name(const char *);
-extern boolean known_branch_stairs(stairway *, char *, boolean);
+extern boolean known_branch_stairs(stairway *);
+extern char *stairs_description(stairway *, char *, boolean);
 extern schar print_dungeon(boolean, schar *, xchar *);
 extern char *get_annotation(d_level *);
 extern int donamelevel(void);

diff --git a/src/display.c b/src/display.c
index bbcd3296074751669b92608e2549eb6da28fe211..d52bc9633ee750efc61aefba0a200339ed4990c1 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -1856,14 +1856,14 @@ back_to_glyph(xchar x, xchar y)
         break;
     case STAIRS:
         sway = stairway_at(x, y);
-        if (known_branch_stairs(sway, (char *) 0, FALSE))
+        if (known_branch_stairs(sway))
             idx = (ptr->ladder & LA_DOWN) ? S_brdnstair : S_brupstair;
         else
             idx = (ptr->ladder & LA_DOWN) ? S_dnstair : S_upstair;
         break;
     case LADDER:
         sway = stairway_at(x, y);
-        if (known_branch_stairs(sway, (char *) 0, FALSE))
+        if (known_branch_stairs(sway))
             idx = (ptr->ladder & LA_DOWN) ? S_brdnladder : S_brupladder;
         else
             idx = (ptr->ladder & LA_DOWN) ? S_dnladder : S_upladder;

diff --git a/src/dungeon.c b/src/dungeon.c
index 4ab6c62de5bc307dc4a55d5f42cd395df0386a03..5bd33e25d141253bb1b28c1c857d25b39c13c35c 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -2113,46 +2113,48 @@ tport_menu(winid win, char *entry, struct lchoice *lchoices,
     return;
 }
 
+/* return True if 'sway' is a branch staircase and hero has used these stairs
+   to visit the branch */
 boolean
-known_branch_stairs(stairway *sway, char *outbuf, boolean stcase)
+known_branch_stairs(stairway *sway)
+{
+    return (sway && sway->tolev.dnum != u.uz.dnum && sway->u_traversed);
+}
+
+/* describe staircase 'sway' based on whether hero knows the destination */
+char *
+stairs_description(
+    stairway *sway, /* stairs/ladder to describe */
+    char *outbuf,   /* result buffer */
+    boolean stcase) /* True: "staircase" or "ladder", always singular;
+                     * False: "stairs" or "ladder"; caller needs to deal
+                     * with singular vs plural when forming a sentence */
 {
     d_level tolev;
     const char *stairs, *updown;
-    int ledgr, dest_visited;
-
-    if (outbuf)
-        *outbuf = '\0';
-    if (!sway)
-        return FALSE;
 
     tolev = sway->tolev;
     stairs = sway->isladder ? "ladder" : stcase ? "staircase" : "stairs";
     updown = sway->up ? "up" : "down";
-    ledgr = ledger_no(&tolev);
-    dest_visited = (g.level_info[ledgr].flags & VISITED) != 0;
-
-    if (tolev.dnum == u.uz.dnum || !sway->u_traversed) {
-        if (outbuf) {
-            Sprintf(outbuf, "%s %s", stairs, updown);
-            if (dest_visited) {
-                boolean specialdepth = (tolev.dnum == quest_dnum
-                                        || tolev.dnum == knox_level.dnum);
-                int to_dlev = specialdepth ? dunlev(&tolev) : depth(&tolev);
-
-                Sprintf(eos(outbuf), " to level %d", to_dlev);
-            }
+
+    if (!known_branch_stairs(sway)) {
+        /* ordinary stairs or branch stairs to not-yet-visited branch */
+        Sprintf(outbuf, "%s %s", stairs, updown);
+        if (sway->u_traversed) {
+            boolean specialdepth = (tolev.dnum == quest_dnum
+                                    || single_level_branch(&tolev)); /* knox */
+            int to_dlev = specialdepth ? dunlev(&tolev) : depth(&tolev);
+
+            Sprintf(eos(outbuf), " to level %d", to_dlev);
         }
-        /* might actually be branch stairs but if the branch hasn't been
-           visited yet, the hero won't know that */
-        return FALSE;
-    }
-    if (outbuf) {
+    } else {
+        /* known branch stairs; tacking on destination level is too verbose */
         Sprintf(outbuf, "branch %s %s to %s",
                 stairs, updown, g.dungeons[tolev.dnum].dname);
+        /* dungeons[].dname is capitalized; undo that for "The <Branch>" */
         (void) strsubst(outbuf, "The ", "the ");
     }
-    /* branch stairs and hero knows it */
-    return TRUE;
+    return outbuf;
 }
 
 /* Convert a branch type to a string usable by print_dungeon(). */

diff --git a/src/invent.c b/src/invent.c
index a76bec57975452b65de71c9537be296125ac0279..50c8b755b5941e28a0554d3f1d2af9a9690e820f 100644 (file)
--- a/src/invent.c
+++ b/src/invent.c
@@ -3325,18 +3325,7 @@ dfeature_at(int x, int y, char *buf)
                 align_str(Amask2align(lev->altarmask & ~AM_SHRINE)));
         dfeature = altbuf;
     } else if (stway) {
-        (void) known_branch_stairs(stway, altbuf, TRUE);
-        dfeature = altbuf;
-#if 0
-        if (!stway->isladder && stway->up)
-            cmap = S_upstair; /* "staircase up" */
-        else if (!stway->isladder && !stway->up)
-            cmap = S_dnstair; /* "staircase down" */
-        else if (stway->isladder && stway->up)
-            cmap = S_upladder; /* "ladder up" */
-        else if (stway->isladder && !stway->up)
-            cmap = S_dnladder; /* "ladder down" */
-#endif
+        dfeature = stairs_description(stway, altbuf, TRUE);
     } else if (ltyp == DRAWBRIDGE_DOWN)
         cmap = S_vodbridge; /* "lowered drawbridge" */
     else if (ltyp == DBWALL)