From: PatR <rankin@nethack.org>
Date: Fri, 11 Feb 2022 20:12:35 +0000 (-0800)
Subject: more curses get_count
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27dd93df177d4300a94c2f1934d68a38c5919455;p=nethack

more curses get_count

A couple of formatting bits I made when investigating cursor
positioning misbehavior for curses menu counts.  No change in
behavior here.
---

diff --git a/src/cmd.c b/src/cmd.c
index d3048fb3e..de5d8fb80 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	cmd.c	$NHDT-Date: 1642630919 2022/01/19 22:21:59 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.500 $ */
+/* NetHack 3.7	cmd.c	$NHDT-Date: 1644610344 2022/02/11 20:12:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.519 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -4746,10 +4746,12 @@ click_to_cmd(int x, int y, int mod)
 
 /* gather typed digits into a number in *count; return the next non-digit */
 char
-get_count(char *allowchars, char inkey,
-          long maxcount, long *count,
-          boolean historicmsg) /* whether to include in message
-                                * history: True => yes */
+get_count(
+    char *allowchars,
+    char inkey,
+    long maxcount,
+    long *count,
+    boolean historicmsg) /* whether to include in ^P history: True => yes */
 {
     char qbuf[QBUFSZ];
     int key;
diff --git a/win/curses/cursdial.c b/win/curses/cursdial.c
index 907a8c8e1..81e92a465 100644
--- a/win/curses/cursdial.c
+++ b/win/curses/cursdial.c
@@ -326,20 +326,18 @@ curses_character_input_dialog(
             break;
         }
 
-        if (digit(answer)) {
-            if (accept_count) {
-                if (answer != '0') {
-                    yn_number = curses_get_count(answer);
-
-                    if (iflags.wc_popup_dialog) {
-                        curses_count_window(NULL);
-                        touchwin(askwin);
-                        wrefresh(askwin);
-                    }
+        if (digit(answer) && accept_count) {
+            if (answer != '0') {
+                yn_number = curses_get_count(answer);
+
+                if (iflags.wc_popup_dialog) {
+                    curses_count_window(NULL);
+                    touchwin(askwin);
+                    wrefresh(askwin);
                 }
-                answer = '#';
-                break;
             }
+            answer = '#';
+            break;
         }
 
         if (any_choice) {