From 737b644630802494f552de184d1e0102f275ad12 Mon Sep 17 00:00:00 2001
From: Habu <habu1010+github@gmail.com>
Date: Fri, 17 Sep 2021 20:11:18 +0900
Subject: [PATCH] =?utf8?q?[Fix]=20=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?utf8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=81=A7=E3=82=A8=E3=83=83?=
 =?utf8?q?=E3=82=BB=E3=83=B3=E3=82=B9=E4=BB=98=E4=B8=8E=E3=81=99=E3=82=8B?=
 =?utf8?q?=E6=99=82=E3=81=AE=E6=8C=99=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

メニューコマンドでエッセンスを付与しようとすると、カーソルの上下で
ページが切り替わってしまうという不具合を修正する。
また、カーソルの左右でページが切り替わるようにする。
---
 src/mind/mind-weaponsmith.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/mind/mind-weaponsmith.cpp b/src/mind/mind-weaponsmith.cpp
index 1f2b03dcc..c2fb931e4 100644
--- a/src/mind/mind-weaponsmith.cpp
+++ b/src/mind/mind-weaponsmith.cpp
@@ -314,7 +314,7 @@ static void add_essence(player_type *player_ptr, SmithCategory mode)
     constexpr auto effect_num_per_page = 22;
     const int page_max = (smith_effect_list.size() - 1) / effect_num_per_page + 1;
 
-    COMMAND_CODE i;
+    COMMAND_CODE i = -1;
     COMMAND_CODE effect_idx;
 
     if (!repeat_pull(&effect_idx) || effect_idx < 0 || effect_idx >= smith_effect_list_max) {
@@ -332,10 +332,12 @@ static void add_essence(player_type *player_ptr, SmithCategory mode)
 
             display_smith_effect_list(smith, smith_effect_list, menu_line, page * effect_num_per_page, effect_num_per_page);
 
+            const auto page_effect_num = std::min<int>(effect_num_per_page, smith_effect_list.size() - (page * effect_num_per_page));
+
             if (!get_com(out_val, &choice, false))
                 break;
 
-            if (use_menu && choice != ' ') {
+            if (use_menu) {
                 switch (choice) {
                 case '0': {
                     screen_load();
@@ -345,7 +347,7 @@ static void add_essence(player_type *player_ptr, SmithCategory mode)
                 case '8':
                 case 'k':
                 case 'K': {
-                    menu_line += (smith_effect_list_max - 1);
+                    menu_line += (page_effect_num - 1);
                     break;
                 }
 
@@ -359,13 +361,16 @@ static void add_essence(player_type *player_ptr, SmithCategory mode)
                 case '4':
                 case 'h':
                 case 'H': {
+                    page += (page_max - 1);
                     menu_line = 1;
                     break;
                 }
                 case '6':
                 case 'l':
-                case 'L': {
-                    menu_line = smith_effect_list_max;
+                case 'L':
+                case ' ': {
+                    page++;
+                    menu_line = 1;
                     break;
                 }
 
@@ -379,13 +384,15 @@ static void add_essence(player_type *player_ptr, SmithCategory mode)
                 }
                 }
 
-                if (menu_line > smith_effect_list_max)
-                    menu_line -= smith_effect_list_max;
+                if (menu_line > page_effect_num)
+                    menu_line -= page_effect_num;
             }
 
             /* Request redraw */
-            if ((choice == ' ') || (choice == '*') || (choice == '?') || (use_menu && ask)) {
-                page++;
+            if ((choice == ' ') || (use_menu && ask)) {
+                if (!use_menu) {
+                    page++;
+                }
                 if (page >= page_max) {
                     page = 0;
                 }
-- 
2.11.0