コマンドメニューがリターンキーを識別するコードを '\r' だけでなく

'\n' も加えた。MPW用。

diff --git a/src/cmd5.c b/src/cmd5.c
index 374a961..a8a929d 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -186,6 +186,7 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm
                                case 'x':
                                case 'X':
                                case '\r':
+                               case '\n':
                                {
                                        i = menu_line - 1;
                                        ask = FALSE;
@@ -5882,11 +5883,6 @@ strnfmt(out_val, 78, "(
                        continue;
                }
 
-               if (choice == '\r' && num == 1)
-               {
-                       choice = 'a';
-               }
-
                if (isalpha(choice))
                {
                        /* Note verify */

diff --git a/src/hissatsu.c b/src/hissatsu.c
index 8af4f78..1132062 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -169,6 +169,7 @@ cptr            p = "ɬ
                                case 'x':
                                case 'X':
                                case '\r':
+                               case '\n':
                                {
                                        i = menu_line - 1;
                                        ask = FALSE;

diff --git a/src/mind.c b/src/mind.c
index a4b5298..4b48357 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -610,6 +610,7 @@ void mindcraft_info(char *p, int use_mind, int power)
                                case 'x':
                                case 'X':
                                case '\r':
+                               case '\n':
                                {
                                        i = menu_line - 1;
                                        ask = FALSE;

diff --git a/src/object1.c b/src/object1.c
index 8ea85ca..74fe9be 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -5501,6 +5501,7 @@ if (allow_floor) strcat(out_val, " '-'
                        case 'x':
                        case 'X':
                        case '\r':
+                       case '\n':
                        {
                                /* Validate the item */
                                if (!get_item_okay(get_item_label))

diff --git a/src/object2.c b/src/object2.c
index d401197..823c433 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -7012,6 +7012,7 @@ static int choose_essence()
                                menu_line+= 4;
                                break;
                        case '\r':
+                       case '\n':
                        case 'x':
                        case 'X':
                                mode = menu_line;
@@ -7175,6 +7176,7 @@ static void add_essence(int mode)
                                case 'x':
                                case 'X':
                                case '\r':
+                               case '\n':
                                {
                                        i = menu_line - 1;
                                        ask = FALSE;
@@ -7843,6 +7845,7 @@ void do_cmd_kaji(bool only_browse)
                                menu_line+= 4;
                                break;
                        case '\r':
+                       case '\n':
                        case 'x':
                        case 'X':
                                mode = menu_line;

diff --git a/src/util.c b/src/util.c
index f624630..9f19b58 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -4017,7 +4017,7 @@ static char inkey_from_menu(void)
 
                /* Get a command */
                sub_cmd = inkey();
-               if ((sub_cmd == ' ') || (sub_cmd == 'x') || (sub_cmd == 'X') || (sub_cmd == '\r'))
+               if ((sub_cmd == ' ') || (sub_cmd == 'x') || (sub_cmd == 'X') || (sub_cmd == '\r') || (sub_cmd == '\n'))
                {
                        if (menu_info[menu][num].fin)
                        {