[Refactor] #38997 do_cmd_kaji() に floor_type * 引数を追加．

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index f7a9ea2..8c127d2 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -1364,7 +1364,7 @@ static void erase_essence(player_type *creature_ptr)
  * @param only_browse TRUEならばエッセンス一覧の表示のみを行う
  * @return なし
  */
-void do_cmd_kaji(bool only_browse)
+void do_cmd_kaji(player_type *creature_ptr, bool only_browse)
 {
        COMMAND_CODE mode = 0;
        char choice;
@@ -1373,9 +1373,9 @@ void do_cmd_kaji(bool only_browse)
 
        if (!only_browse)
        {
-               if (cmd_limit_confused(p_ptr)) return;
-               if (cmd_limit_blind(p_ptr)) return;
-               if (cmd_limit_image(p_ptr)) return;
+               if (cmd_limit_confused(creature_ptr)) return;
+               if (cmd_limit_blind(creature_ptr)) return;
+               if (cmd_limit_image(creature_ptr)) return;
        }
 
        if (!(repeat_pull(&mode) && 1 <= mode && mode <= 5))
@@ -1502,15 +1502,15 @@ void do_cmd_kaji(bool only_browse)
        }
        switch (mode)
        {
-       case 1: display_essence(p_ptr); break;
-       case 2: drain_essence(p_ptr); break;
-       case 3: erase_essence(p_ptr); break;
+       case 1: display_essence(creature_ptr); break;
+       case 2: drain_essence(creature_ptr); break;
+       case 3: erase_essence(creature_ptr); break;
        case 4:
                mode = choose_essence();
                if (mode == 0)
                        break;
-               add_essence(p_ptr, mode);
+               add_essence(creature_ptr, mode);
                break;
-       case 5: add_essence(p_ptr, 10); break;
+       case 5: add_essence(creature_ptr, 10); break;
        }
 }

diff --git a/src/cmd/cmd-smith.h b/src/cmd/cmd-smith.h
index 4e02d0b..242a405 100644 (file)
--- a/src/cmd/cmd-smith.h
+++ b/src/cmd/cmd-smith.h
@@ -19,4 +19,4 @@
 #define ESSENCE_SLAY_GLOVE    (MIN_SPECIAL_ESSENCE + 11)
 
 extern concptr essence_name[];
-extern void do_cmd_kaji(bool only_browse);
+extern void do_cmd_kaji(player_type *creature_ptr, bool only_browse);

diff --git a/src/core.c b/src/core.c
index 2da730e..78c9a7e 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3837,7 +3837,7 @@ static void process_command(void)
                             (p_ptr->pclass == CLASS_MIRROR_MASTER) 
                             ) do_cmd_mind_browse();
                        else if (p_ptr->pclass == CLASS_SMITH)
-                               do_cmd_kaji(TRUE);
+                               do_cmd_kaji(p_ptr, TRUE);
                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
                                do_cmd_magic_eater(p_ptr, TRUE, FALSE);
                        else if (p_ptr->pclass == CLASS_SNIPER)
@@ -3902,7 +3902,7 @@ static void process_command(void)
                                        else if (p_ptr->pclass == CLASS_BLUE_MAGE)
                                                do_cmd_cast_learned();
                                        else if (p_ptr->pclass == CLASS_SMITH)
-                                               do_cmd_kaji(FALSE);
+                                               do_cmd_kaji(p_ptr, FALSE);
                                        else if (p_ptr->pclass == CLASS_SNIPER)
                                                do_cmd_snipe();
                                        else

diff --git a/src/store.c b/src/store.c
index 24af903..f004f5a 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5500,7 +5500,7 @@ static void store_process_command(void)
                             (p_ptr->pclass == CLASS_MIRROR_MASTER) 
                             ) do_cmd_mind_browse();
                        else if (p_ptr->pclass == CLASS_SMITH)
-                               do_cmd_kaji(TRUE);
+                               do_cmd_kaji(p_ptr, TRUE);
                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
                                do_cmd_magic_eater(p_ptr, TRUE, FALSE);
                        else if (p_ptr->pclass == CLASS_SNIPER)