From 70f59b63dab15c4e1aa757e68802fb1a7ee054a2 Mon Sep 17 00:00:00 2001 From: deskull Date: Tue, 2 Jul 2019 00:05:24 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20set=5Fvirtue()=20=E3=81=AB?= =?utf8?q?=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?= =?utf8?q?=E5=8A=A0=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/avatar.c | 6 +++--- src/avatar.h | 2 +- src/bldg.c | 36 ++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/avatar.c b/src/avatar.c index 2090dcaad..2b3a4c386 100644 --- a/src/avatar.c +++ b/src/avatar.c @@ -466,15 +466,15 @@ void chg_virtue(player_type *creature_ptr, int virtue_id, int amount) * @param amount セットしたい値。 * @return なし */ -void set_virtue(int virtue_id, int amount) +void set_virtue(player_type *creature_ptr, int virtue_id, int amount) { int i = 0; for (i = 0; i < 8; i++) { - if (p_ptr->vir_types[i] == virtue_id) + if (creature_ptr->vir_types[i] == virtue_id) { - p_ptr->virtues[i] = (s16b)amount; + creature_ptr->virtues[i] = (s16b)amount; return; } } diff --git a/src/avatar.h b/src/avatar.h index 421716d40..4a1d698d5 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -27,5 +27,5 @@ extern int virtue_number(int type); extern concptr virtue[MAX_VIRTUE]; extern void get_virtues(player_type *creature_ptr); extern void chg_virtue(player_type *creature_ptr, int virtue, int amount); -extern void set_virtue(int virtue, int amount); +extern void set_virtue(player_type *creature_ptr, int virtue, int amount); extern void dump_virtues(FILE * OutFile); diff --git a/src/bldg.c b/src/bldg.c index e90d8ff35..3b09f3bc9 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -4028,24 +4028,24 @@ static void bldg_process_command(building_type *bldg, int i) case BACT_HEIKOUKA: msg_print(_("平衡化の儀式を行なった。", "You received an equalization ritual.")); - set_virtue(V_COMPASSION, 0); - set_virtue(V_HONOUR, 0); - set_virtue(V_JUSTICE, 0); - set_virtue(V_SACRIFICE, 0); - set_virtue(V_KNOWLEDGE, 0); - set_virtue(V_FAITH, 0); - set_virtue(V_ENLIGHTEN, 0); - set_virtue(V_ENCHANT, 0); - set_virtue(V_CHANCE, 0); - set_virtue(V_NATURE, 0); - set_virtue(V_HARMONY, 0); - set_virtue(V_VITALITY, 0); - set_virtue(V_UNLIFE, 0); - set_virtue(V_PATIENCE, 0); - set_virtue(V_TEMPERANCE, 0); - set_virtue(V_DILIGENCE, 0); - set_virtue(V_VALOUR, 0); - set_virtue(V_INDIVIDUALISM, 0); + set_virtue(p_ptr, V_COMPASSION, 0); + set_virtue(p_ptr, V_HONOUR, 0); + set_virtue(p_ptr, V_JUSTICE, 0); + set_virtue(p_ptr, V_SACRIFICE, 0); + set_virtue(p_ptr, V_KNOWLEDGE, 0); + set_virtue(p_ptr, V_FAITH, 0); + set_virtue(p_ptr, V_ENLIGHTEN, 0); + set_virtue(p_ptr, V_ENCHANT, 0); + set_virtue(p_ptr, V_CHANCE, 0); + set_virtue(p_ptr, V_NATURE, 0); + set_virtue(p_ptr, V_HARMONY, 0); + set_virtue(p_ptr, V_VITALITY, 0); + set_virtue(p_ptr, V_UNLIFE, 0); + set_virtue(p_ptr, V_PATIENCE, 0); + set_virtue(p_ptr, V_TEMPERANCE, 0); + set_virtue(p_ptr, V_DILIGENCE, 0); + set_virtue(p_ptr, V_VALOUR, 0); + set_virtue(p_ptr, V_INDIVIDUALISM, 0); get_virtues(p_ptr); paid = TRUE; break; -- 2.11.0