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

[hengband/hengband.git] / src / core.c

diff --git a/src/core.c b/src/core.c
index d42f076..ffc1d2c 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -672,7 +672,7 @@ static void pattern_teleport(void)
 
        leave_quest_check();
 
-       if (record_stair) do_cmd_write_nikki(NIKKI_PAT_TELE, 0, NULL);
+       if (record_stair) exe_write_diary(p_ptr, NIKKI_PAT_TELE, 0, NULL);
 
        p_ptr->inside_quest = 0;
        free_turn(p_ptr);
@@ -1188,7 +1188,7 @@ static void check_music(void)
        { if (one_in_(5) && ((current_floor_ptr->dun_level + 5) > p_ptr->lev) && (current_floor_ptr->dun_level > s_ptr->slevel)) p_ptr->spell_exp[spell] += 1; }
 
        /* Do any effects of continual song */
-       do_spell(REALM_MUSIC, spell, SPELL_CONT);
+       exe_spell(REALM_MUSIC, spell, SPELL_CONT);
 }
 
 /*!
@@ -2960,7 +2960,7 @@ static void process_world_aux_movement(void)
 
                                if (p_ptr->dungeon_idx) p_ptr->recall_dungeon = p_ptr->dungeon_idx;
                                if (record_stair)
-                                       do_cmd_write_nikki(NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
+                                       exe_write_diary(p_ptr, NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
 
                                current_floor_ptr->dun_level = 0;
                                p_ptr->dungeon_idx = 0;
@@ -2979,7 +2979,7 @@ static void process_world_aux_movement(void)
                                p_ptr->dungeon_idx = p_ptr->recall_dungeon;
 
                                if (record_stair)
-                                       do_cmd_write_nikki(NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
+                                       exe_write_diary(p_ptr, NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
 
                                /* New depth */
                                current_floor_ptr->dun_level = max_dlv[p_ptr->dungeon_idx];
@@ -3293,7 +3293,7 @@ static void process_world(void)
        {
                if (min != prev_min)
                {
-                       do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
+                       exe_write_diary(p_ptr, NIKKI_HIGAWARI, 0, NULL);
                        determine_today_mon(FALSE);
                }
        }
@@ -3394,7 +3394,7 @@ static bool enter_wizard_mode(void)
                        return (FALSE);
                }
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode."));
+               exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode."));
                /* Mark savefile */
                p_ptr->noscore |= 0x0002;
        }
@@ -3435,7 +3435,7 @@ static bool enter_debug_mode(void)
                        return (FALSE);
                }
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands."));
+               exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands."));
                /* Mark savefile */
                p_ptr->noscore |= 0x0008;
        }
@@ -3476,7 +3476,7 @@ static bool enter_borg_mode(void)
                        return (FALSE);
                }
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ボーグ・コマンドを使用してスコアを残せなくなった。", "give up recording score to use borg commands."));
+               exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("ボーグ・コマンドを使用してスコアを残せなくなった。", "give up recording score to use borg commands."));
                /* Mark savefile */
                p_ptr->noscore |= 0x0010;
        }
@@ -3945,7 +3945,7 @@ static void process_command(void)
                /* Eat some food */
                case 'E':
                {
-                       do_cmd_eat_food();
+                       do_cmd_eat_food(p_ptr);
                        break;
                }
 
@@ -3994,14 +3994,14 @@ static void process_command(void)
                /* Quaff a potion */
                case 'q':
                {
-                       do_cmd_quaff_potion();
+                       do_cmd_quaff_potion(p_ptr);
                        break;
                }
 
                /* Read a scroll */
                case 'r':
                {
-                       do_cmd_read_scroll();
+                       do_cmd_read_scroll(p_ptr);
                        break;
                }
 
@@ -4074,7 +4074,7 @@ static void process_command(void)
                /* Character description */
                case 'C':
                {
-                       do_cmd_player_status();
+                       do_cmd_player_status(p_ptr);
                        break;
                }
 
@@ -4110,23 +4110,23 @@ static void process_command(void)
                /* Interact with macros */
                case '@':
                {
-                       do_cmd_macros();
+                       do_cmd_macros(p_ptr);
                        break;
                }
 
                /* Interact with visuals */
                case '%':
                {
-                       do_cmd_visuals();
-                       do_cmd_redraw();
+                       do_cmd_visuals(p_ptr);
+                       do_cmd_redraw(p_ptr);
                        break;
                }
 
                /* Interact with colors */
                case '&':
                {
-                       do_cmd_colors();
-                       do_cmd_redraw();
+                       do_cmd_colors(p_ptr);
+                       do_cmd_redraw(p_ptr);
                        break;
                }
 
@@ -4135,7 +4135,7 @@ static void process_command(void)
                {
                        do_cmd_options();
                        (void)combine_and_reorder_home(STORE_HOME);
-                       do_cmd_redraw();
+                       do_cmd_redraw(p_ptr);
                        break;
                }
 
@@ -4158,7 +4158,7 @@ static void process_command(void)
                /* Repeat level feeling */
                case KTRL('F'):
                {
-                       do_cmd_feeling();
+                       do_cmd_feeling(p_ptr);
                        break;
                }
 
@@ -4187,7 +4187,7 @@ static void process_command(void)
                case KTRL('R'):
                {
                        now_message = old_now_message;
-                       do_cmd_redraw();
+                       do_cmd_redraw(p_ptr);
                        break;
                }
 
@@ -4959,7 +4959,7 @@ static void dungeon(bool load_game)
        if ((max_dlv[p_ptr->dungeon_idx] < current_floor_ptr->dun_level) && !p_ptr->inside_quest)
        {
                max_dlv[p_ptr->dungeon_idx] = current_floor_ptr->dun_level;
-               if (record_maxdepth) do_cmd_write_nikki(NIKKI_MAXDEAPTH, current_floor_ptr->dun_level, NULL);
+               if (record_maxdepth) exe_write_diary(p_ptr, NIKKI_MAXDEAPTH, current_floor_ptr->dun_level, NULL);
        }
 
        (void)calculate_upkeep();
@@ -4992,7 +4992,7 @@ static void dungeon(bool load_game)
 
        if (quest_num && (is_fixed_quest_idx(quest_num) &&
            !((quest_num == QUEST_OBERON) || (quest_num == QUEST_SERPENT) ||
-           !(quest[quest_num].flags & QUEST_FLAG_PRESET)))) do_cmd_feeling();
+           !(quest[quest_num].flags & QUEST_FLAG_PRESET)))) do_cmd_feeling(p_ptr);
 
        if (p_ptr->phase_out)
        {
@@ -5421,7 +5421,7 @@ void play_game(bool new_game)
        {
                write_level = FALSE;
 
-               do_cmd_write_nikki(NIKKI_GAMESTART, 1, 
+               exe_write_diary(p_ptr, NIKKI_GAMESTART, 1, 
                                          _("                            ----ゲーム再開----",
                                                "                            ---- Restart Game ----"));
 
@@ -5545,7 +5545,7 @@ void play_game(bool new_game)
        {
                char buf[80];
                sprintf(buf, _("%sに降り立った。", "You are standing in the %s."), map_name());
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, buf);
+               exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, buf);
        }