[Refactor] #38997 do_cmd_observe() に player_type * 引数を追加．

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 1f69263..5b24cd3 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -805,7 +805,7 @@ void do_cmd_destroy(player_type *creature_ptr)
  * @brief アイテムを調査するコマンドのメインルーチン / Observe an item which has been *identify*-ed
  * @return なし
  */
-void do_cmd_observe(void)
+void do_cmd_observe(player_type *creature_ptr)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
@@ -815,7 +815,7 @@ void do_cmd_observe(void)
        q = _("どのアイテムを調べますか? ", "Examine which item? ");
        s = _("調べられるアイテムがない。", "You have nothing to examine.");
 
-       o_ptr = choose_object(p_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
+       o_ptr = choose_object(creature_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
        if (!o_ptr) return;
 
        /* Require full knowledge */

diff --git a/src/cmd-item.h b/src/cmd-item.h
index aff846e..8724e6a 100644 (file)
--- a/src/cmd-item.h
+++ b/src/cmd-item.h
@@ -6,7 +6,7 @@ extern void do_cmd_wield(player_type *creature_ptr);
 extern void do_cmd_takeoff(player_type *creature_ptr);
 extern void do_cmd_drop(player_type *creature_ptr);
 extern void do_cmd_destroy(player_type *creature_ptr);
-extern void do_cmd_observe(void);
+extern void do_cmd_observe(player_type *creature_ptr);
 extern void do_cmd_uninscribe(void);
 extern void do_cmd_inscribe(void);
 extern void do_cmd_refill(void);

diff --git a/src/core.c b/src/core.c
index 341ad7e..91bfdac 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3630,7 +3630,7 @@ static void process_command(void)
                /* Identify an object */
                case 'I':
                {
-                       do_cmd_observe();
+                       do_cmd_observe(p_ptr);
                        break;
                }
 

diff --git a/src/store.c b/src/store.c
index 69152ce..0ae2c28 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5479,7 +5479,7 @@ static void store_process_command(void)
                /* Identify an object */
                case 'I':
                {
-                       do_cmd_observe();
+                       do_cmd_observe(p_ptr);
                        break;
                }