[Refactor] #38997 show_file() にplayer_type * 引数を追加 / Added player_type * argument...

diff --git a/src/autopick.c b/src/autopick.c
index e90b503..aa759c9 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -4847,7 +4847,7 @@ static bool do_editor_command(player_type *player_ptr, text_body_type *tb, int c
 
        case EC_HELP:
                /* Peruse the main help file */
-               (void)show_file(TRUE, _("jeditor.txt", "editor.txt"), NULL, 0, 0);
+               (void)show_file(player_ptr, TRUE, _("jeditor.txt", "editor.txt"), NULL, 0, 0);
                /* Redraw all */
                tb->dirty_flags |= DIRTY_SCREEN;
 

diff --git a/src/birth.c b/src/birth.c
index 40a85bb..94306bc 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -550,13 +550,14 @@ static void birth_quit(void)
 
 /*!
  * @brief 指定されたヘルプファイルを表示する / Show specific help file
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * @param helpfile ファイル名
  * @return なし
  */
-static void show_help(concptr helpfile)
+static void show_help(player_type *creature_ptr, concptr helpfile)
 {
        screen_save();
-       (void)show_file(TRUE, helpfile, NULL, 0, 0);
+       (void)show_file(creature_ptr, TRUE, helpfile, NULL, 0, 0);
        screen_load();
 }
 
@@ -783,7 +784,7 @@ static byte choose_realm(player_type *creature_ptr, s32b choices, int *count)
                else k = -1;
                if (c == '?')
                {
-                       show_help(_("jmagic.txt#MagicRealms", "magic.txt#MagicRealms"));
+                       show_help(creature_ptr, _("jmagic.txt#MagicRealms", "magic.txt#MagicRealms"));
                }
                else if (c == '=')
                {
@@ -2616,9 +2617,9 @@ static bool get_player_race(player_type *creature_ptr)
                if (c == '?')
                {
 #ifdef JP
-                       show_help("jraceclas.txt#TheRaces");
+                       show_help(creature_ptr, "jraceclas.txt#TheRaces");
 #else
-                       show_help("raceclas.txt#TheRaces");
+                       show_help(creature_ptr, "raceclas.txt#TheRaces");
 #endif
                }
                else if (c == '=')
@@ -2788,9 +2789,9 @@ static bool get_player_class(player_type *creature_ptr)
                if (c == '?')
                {
 #ifdef JP
-                       show_help("jraceclas.txt#TheClasses");
+                       show_help(creature_ptr, "jraceclas.txt#TheClasses");
 #else
-                       show_help("raceclas.txt#TheClasses");
+                       show_help(creature_ptr, "raceclas.txt#TheClasses");
 #endif
                }
                else if (c == '=')
@@ -2989,9 +2990,9 @@ static bool get_player_seikaku(player_type *creature_ptr)
                if (c == '?')
                {
 #ifdef JP
-                       show_help("jraceclas.txt#ThePersonalities");
+                       show_help(creature_ptr, "jraceclas.txt#ThePersonalities");
 #else
-                       show_help("raceclas.txt#ThePersonalities");
+                       show_help(creature_ptr, "raceclas.txt#ThePersonalities");
 #endif
                }
                else if (c == '=')
@@ -3024,9 +3025,10 @@ static bool get_player_seikaku(player_type *creature_ptr)
 #ifdef ALLOW_AUTOROLLER
 /*!
  * @brief オートローラで得たい能力値の基準を決める。
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * @return なし
  */
-static bool get_stat_limits(void)
+static bool get_stat_limits(player_type *creature_ptr)
 {
        int i, j, m, cs, os;
        int cval[6];
@@ -3215,9 +3217,9 @@ static bool get_stat_limits(void)
                        break;
                case '?':
 #ifdef JP
-                       show_help("jbirth.txt#AutoRoller");
+                       show_help(creature_ptr, "jbirth.txt#AutoRoller");
 #else
-                       show_help("birth.txt#AutoRoller");
+                       show_help(creature_ptr, "birth.txt#AutoRoller");
 #endif
                        break;
                case '=':
@@ -3501,9 +3503,9 @@ static bool get_chara_limits(player_type *creature_ptr)
                        break;
                case '?':
 #ifdef JP
-                       show_help("jbirth.txt#AutoRoller");
+                       show_help(creature_ptr, "jbirth.txt#AutoRoller");
 #else
-                       show_help("birth.txt#AutoRoller");
+                       show_help(creature_ptr, "birth.txt#AutoRoller");
 #endif
                        break;
                case '=':
@@ -3994,7 +3996,7 @@ static bool player_birth_aux(player_type *creature_ptr)
                        continue;
                }
                else k = -1;
-               if (c == '?') do_cmd_help();
+               if (c == '?') do_cmd_help(creature_ptr);
                else if (c == '=')
                {
                        screen_save();
@@ -4149,7 +4151,7 @@ static bool player_birth_aux(player_type *creature_ptr)
 
        if (autoroller)
        {
-               if (!get_stat_limits()) return FALSE;
+               if (!get_stat_limits(creature_ptr)) return FALSE;
        }
 
        if (autochara)
@@ -4411,9 +4413,9 @@ static bool player_birth_aux(player_type *creature_ptr)
                        if (c == '?')
                        {
 #ifdef JP
-                               show_help("jbirth.txt#AutoRoller");
+                               show_help(creature_ptr, "jbirth.txt#AutoRoller");
 #else
-                               show_help("birth.txt#AutoRoller");
+                               show_help(creature_ptr, "birth.txt#AutoRoller");
 #endif
                                continue;
                        }
@@ -4514,9 +4516,9 @@ static bool ask_quick_start(player_type *creature_ptr)
                else if (c == '?')
                {
 #ifdef JP
-                       show_help("jbirth.txt#QuickStart");
+                       show_help(creature_ptr, "jbirth.txt#QuickStart");
 #else
-                       show_help("birth.txt#QuickStart");
+                       show_help(creature_ptr, "birth.txt#QuickStart");
 #endif
                }
                else if ((c == 'y') || (c == 'Y'))

diff --git a/src/bldg.c b/src/bldg.c
index 6acac50..1a86936 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -453,7 +453,7 @@ static void arena_comm(player_type *player_ptr, int cmd)
                screen_save();
 
                /* Peruse the arena help file */
-               (void)show_file(TRUE, _("arena_j.txt", "arena.txt"), NULL, 0, 0);
+               (void)show_file(player_ptr, TRUE, _("arena_j.txt", "arena.txt"), NULL, 0, 0);
                screen_load();
                break;
        }
@@ -1246,7 +1246,7 @@ static bool gamble_comm(player_type *player_ptr, int cmd)
        if (cmd == BACT_GAMBLE_RULES)
        {
                /* Peruse the gambling help file */
-               (void)show_file(TRUE, _("jgambling.txt", "gambling.txt"), NULL, 0, 0);
+               (void)show_file(player_ptr, TRUE, _("jgambling.txt", "gambling.txt"), NULL, 0, 0);
                screen_load();
                return TRUE;
        }
@@ -2332,12 +2332,13 @@ static void castle_quest(player_type *player_ptr)
 
 /*!
  * @brief 町に関するヘルプを表示する / Display town history
+ * @param player_ptr プレーヤーへの参照ポインタ
  * @return なし
  */
-static void town_history(void)
+static void town_history(player_type *player_ptr)
 {
        screen_save();
-       (void)show_file(TRUE, _("jbldg.txt", "bldg.txt"), NULL, 0, 0);
+       (void)show_file(player_ptr, TRUE, _("jbldg.txt", "bldg.txt"), NULL, 0, 0);
        screen_load();
 }
 
@@ -3917,7 +3918,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i
                paid = identify_fully(player_ptr, FALSE);
                break;
        case BACT_TOWN_HISTORY:
-               town_history();
+               town_history(player_ptr);
                break;
        case BACT_RACE_LEGENDS:
                race_legends(player_ptr);

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index f552b09..45126cb 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -848,7 +848,7 @@ static void display_diary(player_type *creature_ptr)
 #endif
 
        /* Display the file contents */
-       show_file(FALSE, buf, diary_title, -1, 0);
+       show_file(creature_ptr, FALSE, buf, diary_title, -1, 0);
 }
 
 
@@ -3803,7 +3803,7 @@ static void do_cmd_knowledge_inven(player_type *creature_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("*鑑定*済み武器/防具の耐性リスト", "Resistances of *identified* equipment"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("*鑑定*済み武器/防具の耐性リスト", "Resistances of *identified* equipment"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -4266,7 +4266,7 @@ static void do_cmd_knowledge_artifacts(player_type *player_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("既知の伝説のアイテム", "Artifacts Seen"), 0, 0);
+       show_file(player_ptr, TRUE, file_name, _("既知の伝説のアイテム", "Artifacts Seen"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -4275,7 +4275,7 @@ static void do_cmd_knowledge_artifacts(player_type *player_ptr)
  * Display known uniques
  * With "XTRA HACK UNIQHIST" (Originally from XAngband)
  */
-static void do_cmd_knowledge_uniques(void)
+static void do_cmd_knowledge_uniques(player_type *creature_ptr)
 {
        u16b why = 2;
        IDX *who;
@@ -4385,7 +4385,7 @@ static void do_cmd_knowledge_uniques(void)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("まだ生きているユニーク・モンスター", "Alive Uniques"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("まだ生きているユニーク・モンスター", "Alive Uniques"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -4435,7 +4435,7 @@ static void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -4522,7 +4522,7 @@ static void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -4567,7 +4567,7 @@ static void do_cmd_knowledge_skill_exp(player_type *creature_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -4623,18 +4623,19 @@ static void do_cmd_knowledge_pets(player_type *creature_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("現在のペット", "Current Pets"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("現在のペット", "Current Pets"), 0, 0);
        fd_kill(file_name);
 }
 
 
 /*!
  * @brief 現在のペットを表示するコマンドのメインルーチン /
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * Total kill count
  * @return なし
  * @note the player ghosts are ignored.  
  */
-static void do_cmd_knowledge_kill_count(void)
+static void do_cmd_knowledge_kill_count(player_type *creature_ptr)
 {
        /* Open a new file */
        FILE *fff;
@@ -4767,7 +4768,7 @@ if (!fff)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("倒した敵の数", "Kill Count"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("倒した敵の数", "Kill Count"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -6204,7 +6205,7 @@ static void do_cmd_knowledge_bounty(player_type *creature_ptr)
        my_fclose(fff);
        
        /* Display the file contents */
-       show_file(TRUE, file_name, _("賞金首の一覧", "Wanted monsters"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("賞金首の一覧", "Wanted monsters"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -6229,14 +6230,14 @@ static void do_cmd_knowledge_virtues(player_type *creature_ptr)
        my_fclose(fff);
        
        /* Display the file contents */
-       show_file(TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
        fd_kill(file_name);
 }
 
 /*
  * Dungeon
  */
-static void do_cmd_knowledge_dungeon(void)
+static void do_cmd_knowledge_dungeon(player_type *creature_ptr)
 {
        /* Open a new file */
        FILE *fff;
@@ -6267,7 +6268,7 @@ static void do_cmd_knowledge_dungeon(void)
        my_fclose(fff);
        
        /* Display the file contents */
-       show_file(TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -6308,7 +6309,7 @@ static void do_cmd_knowledge_stat(player_type *creature_ptr)
        my_fclose(fff);
        
        /* Display the file contents */
-       show_file(TRUE, file_name, _("自分に関する情報", "HP-rate & Max stat"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("自分に関する情報", "HP-rate & Max stat"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -6671,7 +6672,7 @@ static void do_cmd_knowledge_quests(player_type *creature_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("クエスト達成状況", "Quest status"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("クエスト達成状況", "Quest status"), 0, 0);
        fd_kill(file_name);
 
        /* Free Memory */
@@ -6748,7 +6749,7 @@ static void do_cmd_knowledge_home(player_type *player_ptr)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("我が家のアイテム", "Home Inventory"), 0, 0);
+       show_file(player_ptr, TRUE, file_name, _("我が家のアイテム", "Home Inventory"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -6756,7 +6757,7 @@ static void do_cmd_knowledge_home(player_type *player_ptr)
 /*
  * Check the status of "autopick"
  */
-static void do_cmd_knowledge_autopick(void)
+static void do_cmd_knowledge_autopick(player_type *creature_ptr)
 {
        /* Open a new file */
        FILE *fff;
@@ -6814,7 +6815,7 @@ static void do_cmd_knowledge_autopick(void)
        my_fclose(fff);
 
        /* Display the file contents */
-       show_file(TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
        fd_kill(file_name);
 }
 
@@ -6916,13 +6917,13 @@ void do_cmd_knowledge(player_type *creature_ptr)
                        do_cmd_knowledge_objects(creature_ptr, &need_redraw, FALSE, -1);
                        break;
                case '3': /* Uniques */
-                       do_cmd_knowledge_uniques();
+                       do_cmd_knowledge_uniques(creature_ptr);
                        break;
                case '4': /* Monsters */
                        do_cmd_knowledge_monsters(creature_ptr, &need_redraw, FALSE, -1);
                        break;
                case '5': /* Kill count  */
-                       do_cmd_knowledge_kill_count();
+                       do_cmd_knowledge_kill_count(creature_ptr);
                        break;
                case '6': /* wanted */
                        if (!vanilla_town) do_cmd_knowledge_bounty(creature_ptr);
@@ -6962,13 +6963,13 @@ void do_cmd_knowledge(player_type *creature_ptr)
                        do_cmd_knowledge_virtues(creature_ptr);
                        break;
                case 'g': /* Dungeon */
-                       do_cmd_knowledge_dungeon();
+                       do_cmd_knowledge_dungeon(creature_ptr);
                        break;
                case 'h': /* Quests */
                        do_cmd_knowledge_quests(creature_ptr);
                        break;
                case 'i': /* Autopick */
-                       do_cmd_knowledge_autopick();
+                       do_cmd_knowledge_autopick(creature_ptr);
                        break;
                default: /* Unknown option */
                        bell();

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index 438a3a3..b231cc4 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -831,7 +831,7 @@ static void do_cmd_options_autosave(concptr info)
 
                case '?':
                {
-                       (void)show_file(TRUE, _("joption.txt#Autosave", "option.txt#Autosave"), NULL, 0, 0);
+                       (void)show_file(p_ptr, TRUE, _("joption.txt#Autosave", "option.txt#Autosave"), NULL, 0, 0);
                        Term_clear();
                        break;
                }
@@ -977,7 +977,7 @@ static void do_cmd_options_win(void)
 
                case '?':
                {
-                       (void)show_file(TRUE, _("joption.txt#Window", "option.txt#Window"), NULL, 0, 0);
+                       (void)show_file(p_ptr, TRUE, _("joption.txt#Window", "option.txt#Window"), NULL, 0, 0);
 
                        Term_clear();
                        break;
@@ -1125,7 +1125,7 @@ static void do_cmd_options_cheat(concptr info)
                {
                        strnfmt(buf, sizeof(buf), _("joption.txt#%s", "option.txt#%s"), cheat_info[k].o_text);
                        /* Peruse the help file */
-                       (void)show_file(TRUE, buf, NULL, 0, 0);
+                       (void)show_file(p_ptr, TRUE, buf, NULL, 0, 0);
 
                        Term_clear();
                        break;
@@ -1375,7 +1375,7 @@ void do_cmd_options(void)
                                if (k == ESCAPE) break;
                                else if (k == '?')
                                {
-                                       (void)show_file(TRUE, _("joption.txt#BaseDelay", "option.txt#BaseDelay"), NULL, 0, 0);
+                                       (void)show_file(p_ptr, TRUE, _("joption.txt#BaseDelay", "option.txt#BaseDelay"), NULL, 0, 0);
                                        Term_clear();
                                }
                                else if (isdigit(k)) delay_factor = D2I(k);
@@ -1402,7 +1402,7 @@ void do_cmd_options(void)
                                if (k == ESCAPE) break;
                                else if (k == '?')
                                {
-                                       (void)show_file(TRUE, _("joption.txt#Hitpoint", "option.txt#Hitpoint"), NULL, 0, 0);
+                                       (void)show_file(p_ptr, TRUE, _("joption.txt#Hitpoint", "option.txt#Hitpoint"), NULL, 0, 0);
                                        Term_clear();
                                }
                                else if (isdigit(k)) hitpoint_warn = D2I(k);
@@ -1429,7 +1429,7 @@ void do_cmd_options(void)
                                if (k == ESCAPE) break;
                                else if (k == '?')
                                {
-                                       (void)show_file(TRUE, _("joption.txt#Manapoint", "option.txt#Manapoint"), NULL, 0, 0);
+                                       (void)show_file(p_ptr, TRUE, _("joption.txt#Manapoint", "option.txt#Manapoint"), NULL, 0, 0);
                                        Term_clear();
                                }
                                else if (isdigit(k)) mana_warn = D2I(k);
@@ -1440,7 +1440,7 @@ void do_cmd_options(void)
                }
 
                case '?':
-                       (void)show_file(TRUE, _("joption.txt", "option.txt"), NULL, 0, 0);
+                       (void)show_file(p_ptr, TRUE, _("joption.txt", "option.txt"), NULL, 0, 0);
                        Term_clear();
                        break;
 
@@ -1594,7 +1594,7 @@ void do_cmd_options_aux(int page, concptr info)
                {
                        strnfmt(buf, sizeof(buf), _("joption.txt#%s", "option.txt#%s"), option_info[opt[k]].o_text);
                        /* Peruse the help file */
-                       (void)show_file(TRUE, buf, NULL, 0, 0);
+                       (void)show_file(p_ptr, TRUE, buf, NULL, 0, 0);
 
                        Term_clear();
                        break;

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index a4c9ac3..2e8e736 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -548,7 +548,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
                path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, q);
 
                /* Peruse the help file */
-               (void)show_file(TRUE, buf, o_name, 0, 0);
+               (void)show_file(creature_ptr, TRUE, buf, o_name, 0, 0);
                screen_load();
 
                used_up=FALSE;

diff --git a/src/core.c b/src/core.c
index 45c0114..b0d895a 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -4065,7 +4065,7 @@ static void process_command(player_type *creature_ptr)
                /* Help */
                case '?':
                {
-                       do_cmd_help();
+                       do_cmd_help(creature_ptr);
                        break;
                }
 

diff --git a/src/files.c b/src/files.c
index d8b3832..9269c7b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -5216,6 +5216,7 @@ static void show_file_aux_line(concptr str, int cy, concptr shower)
 /*!
  * @brief ファイル内容をコンソールに出力する
  * Recursive file perusal.
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * @param show_version TRUEならばコンソール上にゲームのバージョンを表示する
  * @param name ファイル名の文字列
  * @param what 内容キャプションの文字列
@@ -5229,7 +5230,7 @@ static void show_file_aux_line(concptr str, int cy, concptr shower)
  * Return FALSE on 'q' to exit from a deep, otherwise TRUE.
  * </pre>
  */
-bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode)
+bool show_file(player_type *creature_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode)
 {
        int i, n, skey;
 
@@ -5544,7 +5545,7 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
                case '?':
                        /* Hack - prevent silly recursion */
                        if (strcmp(name, _("jhelpinfo.txt", "helpinfo.txt")) != 0)
-                               show_file(TRUE, _("jhelpinfo.txt", "helpinfo.txt"), NULL, 0, mode);
+                               show_file(creature_ptr, TRUE, _("jhelpinfo.txt", "helpinfo.txt"), NULL, 0, mode);
                        break;
 
                /* Hack -- try showing */
@@ -5625,7 +5626,7 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
 
                                if (askfor(tmp, 80))
                                {
-                                       if (!show_file(TRUE, tmp, NULL, 0, mode)) skey = 'q';
+                                       if (!show_file(creature_ptr, TRUE, tmp, NULL, 0, mode)) skey = 'q';
                                }
                        }
                        break;
@@ -5684,7 +5685,7 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
                        if ((key > -1) && hook[key][0])
                        {
                                /* Recurse on that file */
-                               if (!show_file(TRUE, hook[key], NULL, 0, mode))
+                               if (!show_file(creature_ptr, TRUE, hook[key], NULL, 0, mode))
                                        skey = 'q';
                        }
                }
@@ -5749,15 +5750,16 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
 /*!
  * @brief ヘルプを表示するコマンドのメインルーチン
  * Peruse the On-Line-Help
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * @return なし
  * @details
  */
-void do_cmd_help(void)
+void do_cmd_help(player_type *creature_ptr)
 {
        screen_save();
 
        /* Peruse the main help file */
-       (void)show_file(TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0);
+       (void)show_file(creature_ptr, TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0);
        screen_load();
 }
 

diff --git a/src/files.h b/src/files.h
index ec711be..df7846d 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -38,8 +38,8 @@ extern errr check_time_init(void);
 extern errr check_load_init(void);
 extern errr check_time(void);
 extern errr check_load(void);
-extern bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode);
-extern void do_cmd_help(void);
+extern bool show_file(player_type *player_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode);
+extern void do_cmd_help(player_type *creature_ptr);
 extern void process_player_name(player_type *creature_ptr, bool sf);
 extern void get_name(player_type *creature_ptr);
 extern void do_cmd_save_game(player_type *creature_ptr, int is_autosave);

diff --git a/src/mutation.c b/src/mutation.c
index 4cf3f7c..1316b91 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2028,7 +2028,7 @@ void do_cmd_knowledge_mutations(player_type *creature_ptr)
        if (fff) dump_mutations(creature_ptr, fff);
        my_fclose(fff);
 
-       show_file(TRUE, file_name, _("突然変異", "Mutations"), 0, 0);
+       show_file(creature_ptr, TRUE, file_name, _("突然変異", "Mutations"), 0, 0);
        fd_kill(file_name);
 }
 

diff --git a/src/store.c b/src/store.c
index 29ec88e..bc98f4a 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5520,7 +5520,7 @@ static void store_process_command(player_type *client_ptr)
                /* Help */
                case '?':
                {
-                       do_cmd_help();
+                       do_cmd_help(client_ptr);
                        break;
                }
 

diff --git a/src/wizard2.c b/src/wizard2.c
index de07eee..2cc31ea 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1734,7 +1734,7 @@ void do_cmd_debug(player_type *creature_ptr)
 
                /* Hack -- Help */
        case '?':
-               do_cmd_help();
+               do_cmd_help(creature_ptr);
                break;
 
                /* Cure all maladies */