From 1b3fc0d6907473b80e2674ec939beb6f1044cd62 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 13 Jun 2020 16:47:54 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#40477=20cmd-gameoption.c=20?= =?utf8?q?=E3=81=ABplayer=5Ftype*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?= =?utf8?q?=E5=8A=A0=E3=81=97=E3=81=9F=20/=20Added=20player=5Ftype*=20argum?= =?utf8?q?ent=20into=20cmd-gameoption.c?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth/auto-roller.c | 6 ++--- src/birth/birth-util.c | 2 +- src/birth/birth-wizard.c | 8 +++--- src/cmd-io/cmd-gameoption.c | 58 ++++++++++++++++++++++---------------------- src/cmd-io/cmd-gameoption.h | 4 +-- src/io/input-key-processor.c | 2 +- src/store/store.c | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/birth/auto-roller.c b/src/birth/auto-roller.c index 1a300175d..83de29918 100644 --- a/src/birth/auto-roller.c +++ b/src/birth/auto-roller.c @@ -162,9 +162,9 @@ bool get_stat_limits(player_type *creature_ptr) case '=': screen_save(); #ifdef JP - do_cmd_options_aux(OPT_PAGE_BIRTH, "初期オプション((*)はスコアに影響)"); + do_cmd_options_aux(creature_ptr, OPT_PAGE_BIRTH, "初期オプション((*)はスコアに影響)"); #else - do_cmd_options_aux(OPT_PAGE_BIRTH, "Birth Option((*)s effect score)"); + do_cmd_options_aux(creature_ptr, OPT_PAGE_BIRTH, "Birth Option((*)s effect score)"); #endif screen_load(); @@ -417,7 +417,7 @@ bool get_chara_limits(player_type *creature_ptr, chara_limit_type *chara_limit_p break; case '=': screen_save(); - do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); + do_cmd_options_aux(creature_ptr, OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); screen_load(); break; default: diff --git a/src/birth/birth-util.c b/src/birth/birth-util.c index ea9ae4d13..597f971be 100644 --- a/src/birth/birth-util.c +++ b/src/birth/birth-util.c @@ -54,7 +54,7 @@ void birth_help_option(player_type *creature_ptr, char c, birth_kind bk) show_help(creature_ptr, help_file); } else if (c == '=') { screen_save(); - do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth option((*)s effect score)")); + do_cmd_options_aux(creature_ptr, OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth option((*)s effect score)")); screen_load(); } else if (c != '2' && c != '4' && c != '6' && c != '8') bell(); diff --git a/src/birth/birth-wizard.c b/src/birth/birth-wizard.c index 5a54b99f0..df718759c 100644 --- a/src/birth/birth-wizard.c +++ b/src/birth/birth-wizard.c @@ -62,7 +62,7 @@ static void display_help_on_sex_select(player_type *creature_ptr, char c) do_cmd_help(creature_ptr); else if (c == '=') { screen_save(); - do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); + do_cmd_options_aux(creature_ptr, OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); screen_load(); } else if (c != '4' && c != '6') bell(); @@ -256,14 +256,14 @@ static bool let_player_build_character(player_type *creature_ptr) return TRUE; } -static void display_initial_options(void) +static void display_initial_options(player_type *creature_ptr) { clear_from(10); put_str(" ", 3, 40); put_str(" ", 4, 40); put_str(" ", 5, 40); screen_save(); - do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); + do_cmd_options_aux(creature_ptr, OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)")); screen_load(); } @@ -504,7 +504,7 @@ bool player_birth_wizard(player_type *creature_ptr, void (*process_autopick_file if (!let_player_build_character(creature_ptr)) return FALSE; - display_initial_options(); + display_initial_options(creature_ptr); if (autoroller || autochara) auto_round = 0L; diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c index 4f2a39498..f4a83cda6 100644 --- a/src/cmd-io/cmd-gameoption.c +++ b/src/cmd-io/cmd-gameoption.c @@ -79,7 +79,7 @@ static s16b toggle_frequency(s16b current) * @param info 表示メッセージ * @return なし */ -static void do_cmd_options_autosave(concptr info) +static void do_cmd_options_autosave(player_type *player_ptr, concptr info) { char ch; int i, k = 0, n = 2; @@ -146,7 +146,7 @@ static void do_cmd_options_autosave(concptr info) } case '?': { - (void)show_file(p_ptr, TRUE, _("joption.txt#Autosave", "option.txt#Autosave"), NULL, 0, 0); + (void)show_file(player_ptr, TRUE, _("joption.txt#Autosave", "option.txt#Autosave"), NULL, 0, 0); Term_clear(); break; } @@ -164,7 +164,7 @@ static void do_cmd_options_autosave(concptr info) * Modify the "window" options * @return なし */ -static void do_cmd_options_win(void) +static void do_cmd_options_win(player_type *player_ptr) { int i, j, d; TERM_LEN y = 0; @@ -244,7 +244,7 @@ static void do_cmd_options_win(void) break; } case '?': { - (void)show_file(p_ptr, TRUE, _("joption.txt#Window", "option.txt#Window"), NULL, 0, 0); + (void)show_file(player_ptr, TRUE, _("joption.txt#Window", "option.txt#Window"), NULL, 0, 0); Term_clear(); break; } @@ -279,7 +279,7 @@ static void do_cmd_options_win(void) * @param info 表示メッセージ * @return なし */ -static void do_cmd_options_cheat(concptr info) +static void do_cmd_options_cheat(player_type *player_ptr, concptr info) { char ch; int i, k = 0, n = MAX_CHEAT_OPTIONS; @@ -332,8 +332,8 @@ static void do_cmd_options_cheat(concptr info) case 'Y': case '6': { if (!current_world_ptr->noscore) - exe_write_diary( - p_ptr, DIARY_DESCRIPTION, 0, _("詐欺オプションをONにして、スコアを残せなくなった。", "gave up sending score to use cheating options.")); + exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, + _("詐欺オプションをONにして、スコアを残せなくなった。", "gave up sending score to use cheating options.")); current_world_ptr->noscore |= (cheat_info[k].o_set * 256 + cheat_info[k].o_bit); (*cheat_info[k].o_var) = TRUE; @@ -349,7 +349,7 @@ static void do_cmd_options_cheat(concptr info) } case '?': { strnfmt(buf, sizeof(buf), _("joption.txt#%s", "option.txt#%s"), cheat_info[k].o_text); - (void)show_file(p_ptr, TRUE, buf, NULL, 0, 0); + (void)show_file(player_ptr, TRUE, buf, NULL, 0, 0); Term_clear(); break; } @@ -390,7 +390,7 @@ void extract_option_vars(void) * in any options which control "visual" aspects of the game. * */ -void do_cmd_options(void) +void do_cmd_options(player_type *player_ptr) { char k; int d, skey; @@ -452,37 +452,37 @@ void do_cmd_options(void) switch (k) { case '1': { - do_cmd_options_aux(OPT_PAGE_INPUT, _("キー入力オプション", "Input Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_INPUT, _("キー入力オプション", "Input Options")); break; } case '2': { - do_cmd_options_aux(OPT_PAGE_MAPSCREEN, _("マップ画面オプション", "Map Screen Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_MAPSCREEN, _("マップ画面オプション", "Map Screen Options")); break; } case '3': { - do_cmd_options_aux(OPT_PAGE_TEXT, _("テキスト表示オプション", "Text Display Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_TEXT, _("テキスト表示オプション", "Text Display Options")); break; } case '4': { - do_cmd_options_aux(OPT_PAGE_GAMEPLAY, _("ゲームプレイ・オプション", "Game-Play Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_GAMEPLAY, _("ゲームプレイ・オプション", "Game-Play Options")); break; } case '5': { - do_cmd_options_aux(OPT_PAGE_DISTURBANCE, _("行動中止関係のオプション", "Disturbance Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_DISTURBANCE, _("行動中止関係のオプション", "Disturbance Options")); break; } case '6': { - do_cmd_options_aux(OPT_PAGE_AUTODESTROY, _("簡易自動破壊オプション", "Easy Auto-Destroyer Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_AUTODESTROY, _("簡易自動破壊オプション", "Easy Auto-Destroyer Options")); break; } case 'R': case 'r': { - do_cmd_options_aux(OPT_PAGE_PLAYRECORD, _("プレイ記録オプション", "Play-record Options")); + do_cmd_options_aux(player_ptr, OPT_PAGE_PLAYRECORD, _("プレイ記録オプション", "Play-record Options")); break; } case 'B': case 'b': { - do_cmd_options_aux(OPT_PAGE_BIRTH, + do_cmd_options_aux(player_ptr, OPT_PAGE_BIRTH, (!current_world_ptr->wizard || !allow_debug_opts) ? _("初期オプション(参照のみ)", "Birth Options(browse only)") : _("初期オプション((*)はスコアに影響)", "Birth Options((*)s effect score)")); break; @@ -493,24 +493,24 @@ void do_cmd_options(void) break; } - do_cmd_options_cheat(_("詐欺師は決して勝利できない！", "Cheaters never win")); + do_cmd_options_cheat(player_ptr, _("詐欺師は決して勝利できない！", "Cheaters never win")); break; } case 'a': case 'A': { - do_cmd_options_autosave(_("自動セーブ", "Autosave")); + do_cmd_options_autosave(player_ptr, _("自動セーブ", "Autosave")); break; } case 'W': case 'w': { - do_cmd_options_win(); - p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MESSAGE | PW_OVERHEAD | PW_MONSTER | PW_OBJECT | PW_SNAPSHOT | PW_DUNGEON + do_cmd_options_win(player_ptr); + player_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MESSAGE | PW_OVERHEAD | PW_MONSTER | PW_OBJECT | PW_SNAPSHOT | PW_DUNGEON | PW_MONSTER_LIST); break; } case 'P': case 'p': { - do_cmd_edit_autopick(p_ptr); + do_cmd_edit_autopick(player_ptr); break; } case 'D': @@ -525,7 +525,7 @@ void do_cmd_options(void) if (k == ESCAPE) break; else if (k == '?') { - (void)show_file(p_ptr, TRUE, _("joption.txt#BaseDelay", "option.txt#BaseDelay"), NULL, 0, 0); + (void)show_file(player_ptr, TRUE, _("joption.txt#BaseDelay", "option.txt#BaseDelay"), NULL, 0, 0); Term_clear(); } else if (isdigit(k)) delay_factor = D2I(k); @@ -546,7 +546,7 @@ void do_cmd_options(void) if (k == ESCAPE) break; else if (k == '?') { - (void)show_file(p_ptr, TRUE, _("joption.txt#Hitpoint", "option.txt#Hitpoint"), NULL, 0, 0); + (void)show_file(player_ptr, TRUE, _("joption.txt#Hitpoint", "option.txt#Hitpoint"), NULL, 0, 0); Term_clear(); } else if (isdigit(k)) hitpoint_warn = D2I(k); @@ -567,7 +567,7 @@ void do_cmd_options(void) if (k == ESCAPE) break; else if (k == '?') { - (void)show_file(p_ptr, TRUE, _("joption.txt#Manapoint", "option.txt#Manapoint"), NULL, 0, 0); + (void)show_file(player_ptr, TRUE, _("joption.txt#Manapoint", "option.txt#Manapoint"), NULL, 0, 0); Term_clear(); } else if (isdigit(k)) mana_warn = D2I(k); @@ -578,7 +578,7 @@ void do_cmd_options(void) break; } case '?': - (void)show_file(p_ptr, TRUE, _("joption.txt", "option.txt"), NULL, 0, 0); + (void)show_file(player_ptr, TRUE, _("joption.txt", "option.txt"), NULL, 0, 0); Term_clear(); break; default: { @@ -591,7 +591,7 @@ void do_cmd_options(void) } screen_load(); - p_ptr->redraw |= (PR_EQUIPPY); + player_ptr->redraw |= (PR_EQUIPPY); } /*! @@ -601,7 +601,7 @@ void do_cmd_options(void) * @param info 表示メッセージ * @return なし */ -void do_cmd_options_aux(int page, concptr info) +void do_cmd_options_aux(player_type *player_ptr, int page, concptr info) { char ch; int i, k = 0, n = 0, l; @@ -693,7 +693,7 @@ void do_cmd_options_aux(int page, concptr info) } case '?': { strnfmt(buf, sizeof(buf), _("joption.txt#%s", "option.txt#%s"), option_info[opt[k]].o_text); - (void)show_file(p_ptr, TRUE, buf, NULL, 0, 0); + (void)show_file(player_ptr, TRUE, buf, NULL, 0, 0); Term_clear(); break; } diff --git a/src/cmd-io/cmd-gameoption.h b/src/cmd-io/cmd-gameoption.h index 38f354245..f810537c8 100644 --- a/src/cmd-io/cmd-gameoption.h +++ b/src/cmd-io/cmd-gameoption.h @@ -3,5 +3,5 @@ #include "system/angband.h" void extract_option_vars(void); -void do_cmd_options_aux(int page, concptr info); -void do_cmd_options(void); +void do_cmd_options_aux(player_type *player_ptr, int page, concptr info); +void do_cmd_options(player_type *player_ptr); diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index 458739bd5..946c3ede0 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -522,7 +522,7 @@ void process_command(player_type *creature_ptr) break; } case '=': { - do_cmd_options(); + do_cmd_options(creature_ptr); (void)combine_and_reorder_home(STORE_HOME); do_cmd_redraw(creature_ptr); break; diff --git a/src/store/store.c b/src/store/store.c index 1c8f8e620..d4afc65b6 100644 --- a/src/store/store.c +++ b/src/store/store.c @@ -1992,7 +1992,7 @@ static void store_process_command(player_type *client_ptr) } case '=': { - do_cmd_options(); + do_cmd_options(client_ptr); (void)combine_and_reorder_home(STORE_HOME); do_cmd_redraw(client_ptr); display_store(client_ptr); -- 2.11.0