From 55b4f1db431046b09271d997966421fea8c47d0b Mon Sep 17 00:00:00 2001 From: Hourier Date: Mon, 13 Jan 2020 18:38:21 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20rd=5Fmonster*()=20?= =?utf8?q?=E3=81=ABplayer=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=20/=20Added=20player=5Ftype=20*=20argument=20?= =?utf8?q?to=20rd=5Fmonster*()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/load.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/load.c b/src/load.c index 1f45bf2f7..a9ca3fe50 100644 --- a/src/load.c +++ b/src/load.c @@ -849,7 +849,7 @@ static void rd_item(object_type *o_ptr) * @param m_ptr モンスター保存先ポインタ * @return なし */ -static void rd_monster_old(monster_type *m_ptr) +static void rd_monster_old(player_type *player_ptr, monster_type *m_ptr) { byte tmp8u; s16b tmp16s; @@ -880,7 +880,7 @@ static void rd_monster_old(monster_type *m_ptr) m_ptr->fy = (POSITION)tmp8u; rd_byte(&tmp8u); m_ptr->fx = (POSITION)tmp8u; - m_ptr->current_floor_ptr = p_ptr->current_floor_ptr; + m_ptr->current_floor_ptr = player_ptr->current_floor_ptr; rd_s16b(&tmp16s); m_ptr->hp = tmp16s; @@ -1009,7 +1009,7 @@ static void rd_monster_old(monster_type *m_ptr) * @param m_ptr モンスター保存先ポインタ * @return なし */ -static void rd_monster(monster_type *m_ptr) +static void rd_monster(player_type *player_ptr, monster_type *m_ptr) { BIT_FLAGS flags; char buf[128]; @@ -1019,7 +1019,7 @@ static void rd_monster(monster_type *m_ptr) if (h_older_than(1, 5, 0, 0)) { - rd_monster_old(m_ptr); + rd_monster_old(player_ptr, m_ptr); return; } @@ -2365,7 +2365,7 @@ static void rd_extra(player_type *creature_ptr) { monster_type dummy_mon; - rd_monster(&dummy_mon); + rd_monster(creature_ptr, &dummy_mon); } } @@ -2938,7 +2938,7 @@ static errr rd_dungeon_old(player_type *creature_ptr) m_ptr = &floor_ptr->m_list[m_idx]; /* Read the monster */ - rd_monster(m_ptr); + rd_monster(creature_ptr, m_ptr); /* Access grid */ @@ -3239,7 +3239,7 @@ static errr rd_saved_floor(player_type *player_ptr, saved_floor_type *sf_ptr) m_ptr = &floor_ptr->m_list[m_idx]; /* Read the monster */ - rd_monster(m_ptr); + rd_monster(player_ptr, m_ptr); /* Access grid */ -- 2.11.0