From 233a0a3cdf7f9bcc2740d196bb65a397e57340c1 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 19 Dec 2019 00:27:02 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20process=5Fupkeep=5Fwith=5F?= =?utf8?q?speed()=20=E3=81=AB=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20player=5Ftype?= =?utf8?q?=20*=20argument=20to=20process=5Fupkeep=5Fwith=5Fspeed().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core.c b/src/core.c index df2182144..6222510a4 100644 --- a/src/core.c +++ b/src/core.c @@ -4338,28 +4338,28 @@ static void pack_overflow(player_type *owner_ptr) * @brief プレイヤーの行動エネルギーが充填される（＝プレイヤーのターンが回る）毎に行われる処理 / process the effects per 100 energy at player speed. * @return なし */ -static void process_upkeep_with_speed(void) +static void process_upkeep_with_speed(player_type *creature_ptr) { /* Give the player some energy */ - if (!load && p_ptr->enchant_energy_need > 0 && !p_ptr->leaving) + if (!load && creature_ptr->enchant_energy_need > 0 && !creature_ptr->leaving) { - p_ptr->enchant_energy_need -= SPEED_TO_ENERGY(p_ptr->pspeed); + creature_ptr->enchant_energy_need -= SPEED_TO_ENERGY(creature_ptr->pspeed); } /* No turn yet */ - if (p_ptr->enchant_energy_need > 0) return; + if (creature_ptr->enchant_energy_need > 0) return; - while (p_ptr->enchant_energy_need <= 0) + while (creature_ptr->enchant_energy_need <= 0) { /* Handle the player song */ - if (!load) check_music(p_ptr); + if (!load) check_music(creature_ptr); /* Hex - Handle the hex spells */ - if (!load) check_hex(p_ptr); - if (!load) revenge_spell(p_ptr); + if (!load) check_hex(creature_ptr); + if (!load) revenge_spell(creature_ptr); /* There is some randomness of needed energy */ - p_ptr->enchant_energy_need += ENERGY_NEED(); + creature_ptr->enchant_energy_need += ENERGY_NEED(); } } @@ -5071,7 +5071,7 @@ static void dungeon(player_type *player_ptr, bool load_game) /* Process the player */ process_player(player_ptr); - process_upkeep_with_speed(); + process_upkeep_with_speed(player_ptr); handle_stuff(); -- 2.11.0