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

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 57ef3cb..f9aaf7d 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -874,7 +874,7 @@ void do_cmd_uninscribe(player_type *creature_ptr)
  * Inscribe an object with a comment
  * @return なし
  */
-void do_cmd_inscribe(void)
+void do_cmd_inscribe(player_type *creature_ptr)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
@@ -885,7 +885,7 @@ void do_cmd_inscribe(void)
        q = _("どのアイテムに銘を刻みますか? ", "Inscribe which item? ");
        s = _("銘を刻めるアイテムがない。", "You have nothing to inscribe.");
 
-       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;
 
        /* Describe the activity */
@@ -909,11 +909,11 @@ void do_cmd_inscribe(void)
        {
                /* Save the inscription */
                o_ptr->inscription = quark_add(out_val);
-               p_ptr->update |= (PU_COMBINE);
-               p_ptr->window |= (PW_INVEN | PW_EQUIP);
+               creature_ptr->update |= (PU_COMBINE);
+               creature_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                /* .や$の関係で, 再計算が必要なはず -- henkma */
-               p_ptr->update |= (PU_BONUS);
+               creature_ptr->update |= (PU_BONUS);
        }
 }
 

diff --git a/src/cmd-item.h b/src/cmd-item.h
index 523fbf4..81a0bc4 100644 (file)
--- a/src/cmd-item.h
+++ b/src/cmd-item.h
@@ -8,7 +8,7 @@ extern void do_cmd_drop(player_type *creature_ptr);
 extern void do_cmd_destroy(player_type *creature_ptr);
 extern void do_cmd_observe(player_type *creature_ptr);
 extern void do_cmd_uninscribe(player_type *creature_ptr);
-extern void do_cmd_inscribe(void);
+extern void do_cmd_inscribe(player_type *creature_ptr);
 extern void do_cmd_refill(void);
 extern void do_cmd_target(void);
 extern void do_cmd_look(void);

diff --git a/src/core.c b/src/core.c
index 60a4d2e..a6c2d22 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3924,7 +3924,7 @@ static void process_command(void)
                /* Inscribe an object */
                case '{':
                {
-                       do_cmd_inscribe();
+                       do_cmd_inscribe(p_ptr);
                        break;
                }
 

diff --git a/src/store.c b/src/store.c
index 2fb52aa..6fdf33b 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5512,7 +5512,7 @@ static void store_process_command(void)
                /* Inscribe an object */
                case '{':
                {
-                       do_cmd_inscribe();
+                       do_cmd_inscribe(p_ptr);
                        break;
                }