From cbc2a3db58c5f9e52da443534680e36c58b6add7 Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 31 Jul 2019 21:55:22 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?= =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-item.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/src/cmd-item.c b/src/cmd-item.c index 04839e9ca..889743098 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -1,6 +1,6 @@ /*! - * @file cmd3.c - * @brief プレイヤーのアイテムに関するコマンドの実装1 / Inventory commands + * @file cmd-item.c + * @brief プレイヤーのアイテムに関するコマンドの実装1 / Inventory and equipment commands * @date 2014/01/02 * @author * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke @@ -57,15 +57,9 @@ void do_cmd_inven(void) { char out_val[160]; - - /* Note that we are in "p_ptr->inventory_list" mode */ command_wrk = FALSE; - - /* Note that we are in "p_ptr->inventory_list" mode */ if (easy_floor) command_wrk = (USE_INVEN); screen_save(); - - /* Display the p_ptr->inventory_list */ (void)show_inven(0, USE_FULL, 0); #ifdef JP @@ -82,22 +76,15 @@ void do_cmd_inven(void) command_new = inkey(); screen_load(); - /* Process "Escape" */ if (command_new == ESCAPE) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); - - /* Reset stuff */ command_new = 0; command_gap = wid - 30; } - - /* Process normal keys */ else { - /* Hack -- Use "display" mode */ command_see = TRUE; } } @@ -110,17 +97,12 @@ void do_cmd_inven(void) void do_cmd_equip(void) { char out_val[160]; - - /* Note that we are in "equipment" mode */ command_wrk = TRUE; - - /* Note that we are in "equipment" mode */ if (easy_floor) command_wrk = (USE_EQUIP); screen_save(); (void)show_equip(0, USE_FULL, 0); - /* Build a prompt */ #ifdef JP sprintf(out_val, "装備: 合計 %3d.%1d kg (限界の%ld%%) コマンド: ", (int)lbtokg1(p_ptr->total_weight) , (int)lbtokg2(p_ptr->total_weight) , @@ -135,29 +117,20 @@ void do_cmd_equip(void) command_new = inkey(); screen_load(); - /* Process "Escape" */ if (command_new == ESCAPE) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); - - /* Reset stuff */ command_new = 0; command_gap = wid - 30; } - /* Process normal keys */ else { - /* Enter "display" mode */ command_see = TRUE; } } - - - bool select_ring_slot = FALSE; /*! -- 2.11.0