[Refactor] #38997 leave_tower_check() にplayer_type * 引数を追加 / Added floor_type * argum...

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 1ad24ed..b6d7f9a 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -365,7 +365,7 @@ void do_cmd_go_down(player_type *creature_ptr)
                        msg_print(_("下の階に降りた。", "You enter the down staircase."));
 
                leave_quest_check(creature_ptr);
-               leave_tower_check();
+               leave_tower_check(creature_ptr);
 
                creature_ptr->current_floor_ptr->inside_quest = g_ptr->special;
 

diff --git a/src/core.c b/src/core.c
index 281e06c..d8cfa57 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -2970,7 +2970,7 @@ static void process_world_aux_movement(player_type *creature_ptr)
                                creature_ptr->dungeon_idx = 0;
 
                                leave_quest_check(creature_ptr);
-                               leave_tower_check();
+                               leave_tower_check(creature_ptr);
 
                                creature_ptr->current_floor_ptr->inside_quest = 0;
 

diff --git a/src/quest.c b/src/quest.c
index 68fecba..a856254 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -496,13 +496,14 @@ void leave_quest_check(player_type *player_ptr)
        }
 }
 
+
 /*!
  * @brief 「塔」クエストの各階層から離脱する際の処理
  * @return なし
  */
-void leave_tower_check(void)
+void leave_tower_check(player_type *player_ptr)
 {
-       leaving_quest = p_ptr->current_floor_ptr->inside_quest;
+       leaving_quest = player_ptr->current_floor_ptr->inside_quest;
        /* Check for Tower Quest */
        if (leaving_quest &&
                (quest[leaving_quest].type == QUEST_TYPE_TOWER) &&
@@ -511,7 +512,7 @@ void leave_tower_check(void)
                if (quest[leaving_quest].type == QUEST_TYPE_TOWER)
                {
                        quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
-                       quest[QUEST_TOWER1].complev = p_ptr->lev;
+                       quest[QUEST_TOWER1].complev = player_ptr->lev;
                        update_playtime();
                        quest[QUEST_TOWER1].comptime = current_world_ptr->play_time;
                }

diff --git a/src/quest.h b/src/quest.h
index 7d4c8fd..5b90d64 100644 (file)
--- a/src/quest.h
+++ b/src/quest.h
@@ -93,5 +93,5 @@ extern void quest_discovery(QUEST_IDX q_idx);
 extern QUEST_IDX quest_number(player_type *player_ptr, DEPTH level);
 extern QUEST_IDX random_quest_number(player_type *player_ptr, DEPTH level);
 extern void leave_quest_check(player_type *player_ptr);
-extern void leave_tower_check(void);
+extern void leave_tower_check(player_type *player_ptr);
 extern void do_cmd_quest(player_type *player_ptr);