From de7922b0c4e2dc69fd47e4cacb6b3c2f10d2c89f Mon Sep 17 00:00:00 2001 From: deskull Date: Fri, 19 Apr 2019 20:17:58 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=E3=80=80effects.c=20?= =?utf8?q?=E3=82=92=20player-effects.c=20=E3=81=AB=E6=94=B9=E5=90=8D?= =?utf8?q?=E3=81=97=E3=81=A4=E3=81=A4=E3=80=81=E5=AE=A3=E8=A8=80=E3=82=92?= =?utf8?q?=20player-effects.h=20=E3=82=92=E5=88=86=E9=9B=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Hengband_vcs2017/Hengband/Hengband.vcxproj | 3 +- Hengband_vcs2017/Hengband/Hengband.vcxproj.filters | 7 ++- src/Makefile.am | 3 +- src/bldg.c | 1 + src/chest.c | 1 + src/cmd-activate.c | 1 + src/cmd-basic.c | 1 + src/cmd-eat.c | 1 + src/cmd-hissatsu.c | 1 + src/cmd-item.c | 1 + src/cmd-mane.c | 1 + src/cmd-pet.c | 1 + src/cmd-quaff.c | 1 + src/cmd-read.c | 1 + src/cmd-spell.c | 1 + src/cmd-usestaff.c | 1 + src/cmd-zaprod.c | 1 + src/cmd-zapwand.c | 1 + src/cmd4.c | 1 + src/dungeon.c | 1 + src/externs.h | 72 ---------------------- src/floor-events.c | 1 + src/floor-save.c | 1 + src/grid.c | 1 + src/melee1.c | 1 + src/mind.c | 1 + src/monster-status.c | 1 + src/mspells3.c | 1 + src/mspells4.c | 1 + src/mutation.c | 1 + src/object2.c | 3 +- src/patron.c | 1 + src/player-damage.c | 1 + src/{effects.c => player-effects.c} | 2 + src/player-move.c | 1 + src/player-status.c | 1 + src/racial.c | 1 + src/realm-arcane.c | 1 + src/realm-chaos.c | 1 + src/realm-craft.c | 1 + src/realm-crusade.c | 1 + src/realm-daemon.c | 1 + src/realm-death.c | 1 + src/realm-hex.c | 1 + src/realm-hissatsu.c | 1 + src/realm-life.c | 1 + src/realm-nature.c | 1 + src/realm-song.c | 1 + src/realm-sorcery.c | 1 + src/realm-trump.c | 1 + src/spells-floor.c | 1 + src/spells-object.c | 1 + src/spells-status.c | 1 + src/spells1.c | 1 + src/spells2.c | 1 + src/spells3.c | 1 + src/store.c | 1 + src/trap.c | 1 + src/wild.c | 1 + src/wizard2.c | 1 + 60 files changed, 68 insertions(+), 76 deletions(-) rename src/{effects.c => player-effects.c} (99%) diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index 0642584b2..8fce149f5 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -170,6 +170,7 @@ + @@ -206,7 +207,6 @@ - @@ -320,6 +320,7 @@ + diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index bb3718678..3bf6abf2d 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -14,7 +14,6 @@ - @@ -264,6 +263,9 @@ io + + player + @@ -489,6 +491,9 @@ io + + player + diff --git a/src/Makefile.am b/src/Makefile.am index 5cc11ac73..1a4623368 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ hengband_SOURCES = \ cmd-usestaff.c cmd-usestaff.h cmd-zaprod.c cmd-zaprod.h cmd-zapwand.c \ cmd-zapwand.h cmd-smith.c cmd-smith.h cmd-hissatsu.c cmd-hissatsu.h\ \ - defines.h dungeon.c effects.c externs.h files.c files.h \ + defines.h dungeon.c externs.h files.c files.h \ \ floor.h floor-events.c floor-events.h floor-generate.c floor-generate.h \ floor-save.h floor-save.c \ @@ -54,6 +54,7 @@ hengband_SOURCES = \ projection.h projection.c\ \ player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \ + player-effects.c player-effects.h \ \ quest.h quest.c\ \ diff --git a/src/bldg.c b/src/bldg.c index 8243e1ef9..91c6bff28 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -39,6 +39,7 @@ #include "dungeon-file.h" #include "files.h" +#include "player-effects.h" /*! * @brief 闘技場のモンスターID及び報酬アイテムテーブル diff --git a/src/chest.c b/src/chest.c index c7728f7b6..be86cbad5 100644 --- a/src/chest.c +++ b/src/chest.c @@ -5,6 +5,7 @@ #include "floor.h" #include "trap.h" #include "player-status.h" +#include "player-effects.h" /*! * @brief 箱からアイテムを引き出す / diff --git a/src/cmd-activate.c b/src/cmd-activate.c index 902048ab6..fb715b41d 100644 --- a/src/cmd-activate.c +++ b/src/cmd-activate.c @@ -21,6 +21,7 @@ #include "spells-floor.h" #include "realm-hex.h" #include "player-status.h" +#include "player-effects.h" #include "monster-status.h" #include "files.h" diff --git a/src/cmd-basic.c b/src/cmd-basic.c index 4e13057cc..84a7e9b93 100644 --- a/src/cmd-basic.c +++ b/src/cmd-basic.c @@ -29,6 +29,7 @@ #include "grid.h" #include "feature.h" #include "player-move.h" +#include "player-effects.h" #include "object-broken.h" #include "object-flavor.h" #include "shoot.h" diff --git a/src/cmd-eat.c b/src/cmd-eat.c index e4383fbaa..b24e3d64e 100644 --- a/src/cmd-eat.c +++ b/src/cmd-eat.c @@ -14,6 +14,7 @@ #include "spells-status.h" #include "realm-hex.h" #include "player-status.h" +#include "player-effects.h" /*! * @brief 食料を食べるコマンドのサブルーチン diff --git a/src/cmd-hissatsu.c b/src/cmd-hissatsu.c index ba2c85382..79b2f9505 100644 --- a/src/cmd-hissatsu.c +++ b/src/cmd-hissatsu.c @@ -13,6 +13,7 @@ #include "angband.h" #include "monsterrace-hook.h" #include "player-status.h" +#include "player-effects.h" #include "cmd-basic.h" #include "cmd-spell.h" diff --git a/src/cmd-item.c b/src/cmd-item.c index 08ac32dce..4bc0bc0e4 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -30,6 +30,7 @@ #include "artifact.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" #include "monster.h" diff --git a/src/cmd-mane.c b/src/cmd-mane.c index bcacf3525..2befe2f47 100644 --- a/src/cmd-mane.c +++ b/src/cmd-mane.c @@ -21,6 +21,7 @@ #include "monster-process.h" #include "cmd-spell.h" #include "player-status.h" +#include "player-effects.h" #include "cmd-basic.h" static int damage; diff --git a/src/cmd-pet.c b/src/cmd-pet.c index ccbe47437..187d1fd83 100644 --- a/src/cmd-pet.c +++ b/src/cmd-pet.c @@ -5,6 +5,7 @@ #include "sort.h" #include "player-move.h" #include "player-status.h" +#include "player-effects.h" #include "object-hook.h" #include "monster.h" #include "monster-status.h" diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c index fa2fad9fe..705d16822 100644 --- a/src/cmd-quaff.c +++ b/src/cmd-quaff.c @@ -13,6 +13,7 @@ #include "avatar.h" #include "spells-status.h" #include "player-status.h" +#include "player-effects.h" #include "realm-hex.h" #include "spells-floor.h" #include "object-broken.h" diff --git a/src/cmd-read.c b/src/cmd-read.c index 15e0e7aa8..70abc84e8 100644 --- a/src/cmd-read.c +++ b/src/cmd-read.c @@ -12,6 +12,7 @@ #include "artifact.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" #include "rumor.h" #include "realm-hex.h" diff --git a/src/cmd-spell.c b/src/cmd-spell.c index a20259e4a..fb7db61ec 100644 --- a/src/cmd-spell.c +++ b/src/cmd-spell.c @@ -25,6 +25,7 @@ #include "angband.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" #include "object-hook.h" #include "cmd-basic.h" diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c index 716c7f0dd..1472dafee 100644 --- a/src/cmd-usestaff.c +++ b/src/cmd-usestaff.c @@ -2,6 +2,7 @@ #include "spells-summon.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" #include "spells-status.h" #include "spells-floor.h" #include "object-hook.h" diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c index 527a47a28..de99f2888 100644 --- a/src/cmd-zaprod.c +++ b/src/cmd-zaprod.c @@ -1,6 +1,7 @@ #include "angband.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" #include "object-hook.h" #include "spells.h" #include "spells-status.h" diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c index 062051e46..6de7b4195 100644 --- a/src/cmd-zapwand.c +++ b/src/cmd-zapwand.c @@ -3,6 +3,7 @@ #include "spells.h" #include "spells-status.h" #include "player-status.h" +#include "player-effects.h" #include "object-hook.h" #include "cmd-basic.h" diff --git a/src/cmd4.c b/src/cmd4.c index a694d0807..0e1c08180 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -43,6 +43,7 @@ #include "cmd-pet.h" #include "cmd-spell.h" #include "world.h" +#include "player-effects.h" #include "player-status.h" #include "sort.h" #include "mutation.h" diff --git a/src/dungeon.c b/src/dungeon.c index 0e67003ed..84aa8c56d 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -56,6 +56,7 @@ #include "view-mainwindow.h" #include "dungeon-file.h" #include "files.h" +#include "player-effects.h" static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/ static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/ diff --git a/src/externs.h b/src/externs.h index a42dfb1f8..51d93b463 100644 --- a/src/externs.h +++ b/src/externs.h @@ -884,78 +884,6 @@ extern void update_output(void); extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines); extern void update_playtime(void); - -/* effects.c */ -extern void set_action(ACTION_IDX typ); -extern void reset_tim_flags(void); -extern void dispel_player(void); -extern bool set_mimic(TIME_EFFECT v, IDX p, bool do_dec); -extern bool set_blind(TIME_EFFECT v); -extern bool set_confused(TIME_EFFECT v); -extern bool set_poisoned(TIME_EFFECT v); -extern bool set_afraid(TIME_EFFECT v); -extern bool set_paralyzed(TIME_EFFECT v); -extern bool set_image(TIME_EFFECT v); -extern bool set_fast(TIME_EFFECT v, bool do_dec); -extern bool set_slow(TIME_EFFECT v, bool do_dec); -extern bool set_shield(TIME_EFFECT v, bool do_dec); -extern bool set_tsubureru(TIME_EFFECT v, bool do_dec); -extern bool set_magicdef(TIME_EFFECT v, bool do_dec); -extern bool set_blessed(TIME_EFFECT v, bool do_dec); -extern bool set_hero(TIME_EFFECT v, bool do_dec); -extern bool set_shero(TIME_EFFECT v, bool do_dec); -extern bool set_protevil(TIME_EFFECT v, bool do_dec); -extern bool set_invuln(TIME_EFFECT v, bool do_dec); -extern bool set_tim_invis(TIME_EFFECT v, bool do_dec); -extern bool set_tim_infra(TIME_EFFECT v, bool do_dec); -extern bool set_tim_regen(TIME_EFFECT v, bool do_dec); -extern bool set_tim_stealth(TIME_EFFECT v, bool do_dec); -extern bool set_lightspeed(TIME_EFFECT v, bool do_dec); -extern bool set_tim_levitation(TIME_EFFECT v, bool do_dec); -extern bool set_tim_sh_touki(TIME_EFFECT v, bool do_dec); -extern bool set_tim_sh_fire(TIME_EFFECT v, bool do_dec); -extern bool set_tim_sh_holy(TIME_EFFECT v, bool do_dec); -extern bool set_tim_eyeeye(TIME_EFFECT v, bool do_dec); -extern bool set_resist_magic(TIME_EFFECT v, bool do_dec); -extern bool set_tim_reflect(TIME_EFFECT v, bool do_dec); -extern bool set_multishadow(TIME_EFFECT v, bool do_dec); -extern bool set_dustrobe(TIME_EFFECT v, bool do_dec); -extern bool set_kabenuke(TIME_EFFECT v, bool do_dec); -extern bool set_tsuyoshi(TIME_EFFECT v, bool do_dec); -extern bool set_ele_attack(u32b attack_type, TIME_EFFECT v); -extern bool set_ele_immune(u32b immune_type, TIME_EFFECT v); -extern bool set_oppose_acid(TIME_EFFECT v, bool do_dec); -extern bool set_oppose_elec(TIME_EFFECT v, bool do_dec); -extern bool set_oppose_fire(TIME_EFFECT v, bool do_dec); -extern bool set_oppose_cold(TIME_EFFECT v, bool do_dec); -extern bool set_oppose_pois(TIME_EFFECT v, bool do_dec); -extern bool set_stun(TIME_EFFECT v); -extern bool set_cut(TIME_EFFECT v); -extern bool set_food(TIME_EFFECT v); -extern bool inc_stat(int stat); -extern bool dec_stat(int stat, int amount, int permanent); -extern bool res_stat(int stat); -extern bool hp_player(int num); -extern bool do_dec_stat(int stat); -extern bool do_res_stat(int stat); -extern bool do_inc_stat(int stat); -extern bool restore_level(void); -extern bool lose_all_info(void); -extern void gain_exp_64(s32b amount, u32b amount_frac); -extern void gain_exp(s32b amount); -extern void calc_android_exp(void); -extern void lose_exp(s32b amount); -extern bool drain_exp(s32b drain, s32b slip, int hold_exp_prob); -extern void do_poly_self(void); -extern bool set_ultimate_res(TIME_EFFECT v, bool do_dec); -extern bool set_tim_res_nether(TIME_EFFECT v, bool do_dec); -extern bool set_tim_res_time(TIME_EFFECT v, bool do_dec); -extern bool choose_ele_attack(void); -extern bool choose_ele_immune(TIME_EFFECT turn); -extern bool set_wraith_form(TIME_EFFECT v, bool do_dec); -extern bool set_tim_esp(TIME_EFFECT v, bool do_dec); -extern bool set_superstealth(bool set); - /* view-mainwindow.c */ extern void resize_map(void); extern void redraw_window(void); diff --git a/src/floor-events.c b/src/floor-events.c index 5163bc82d..f030cbdf5 100644 --- a/src/floor-events.c +++ b/src/floor-events.c @@ -8,6 +8,7 @@ #include "object-hook.h" #include "player-move.h" #include "world.h" +#include "player-effects.h" static bool mon_invis; static POSITION mon_fy, mon_fx; diff --git a/src/floor-save.c b/src/floor-save.c index 5b0bef784..ba63dc25e 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -24,6 +24,7 @@ #include "cmd-pet.h" #include "cmd-basic.h" #include "files.h" +#include "player-effects.h" static FLOOR_IDX new_floor_id; /*!<次のフロアのID / floor_id of the destination */ static u32b change_floor_mode; /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */ diff --git a/src/grid.c b/src/grid.c index 7d855a340..8e5f3cfe9 100644 --- a/src/grid.c +++ b/src/grid.c @@ -31,6 +31,7 @@ #include "feature.h" #include "monster-status.h" #include "player-status.h" +#include "player-effects.h" #include "spells.h" #include "view-mainwindow.h" diff --git a/src/melee1.c b/src/melee1.c index 56d925812..e09de5cdb 100644 --- a/src/melee1.c +++ b/src/melee1.c @@ -30,6 +30,7 @@ #include "floor.h" #include "spells.h" #include "files.h" +#include "player-effects.h" diff --git a/src/mind.c b/src/mind.c index 43172ae5d..1c8694108 100644 --- a/src/mind.c +++ b/src/mind.c @@ -29,6 +29,7 @@ #include "grid.h" #include "cmd-basic.h" #include "monster-status.h" +#include "player-effects.h" /*! 特殊技能の一覧テーブル */ mind_power const mind_powers[5] = diff --git a/src/monster-status.c b/src/monster-status.c index ff3c24cf6..432d6b441 100644 --- a/src/monster-status.c +++ b/src/monster-status.c @@ -11,6 +11,7 @@ #include "artifact.h" #include "avatar.h" #include "files.h" +#include "player-effects.h" /*! diff --git a/src/mspells3.c b/src/mspells3.c index 8ae1bfe3c..6aa2c0af2 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -22,6 +22,7 @@ #include "monster-status.h" #include "spells.h" #include "cmd-basic.h" +#include "player-effects.h" #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130) /*!< モンスター魔法をプレイヤーが使用する場合の換算レベル */ diff --git a/src/mspells4.c b/src/mspells4.c index 9fbcae094..5538b8e98 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -18,6 +18,7 @@ #include "monster-status.h" #include "spells.h" #include "melee.h" +#include "player-effects.h" /*! diff --git a/src/mutation.c b/src/mutation.c index f1885ed8c..ed16364d6 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -18,6 +18,7 @@ #include "spells-summon.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" #include "spells-status.h" #include "object-hook.h" #include "spells.h" diff --git a/src/object2.c b/src/object2.c index 9ff742fb1..159cf615c 100644 --- a/src/object2.c +++ b/src/object2.c @@ -20,9 +20,10 @@ #include "object-curse.h" #include "objectkind-hook.h" #include "artifact.h" -#include "player-status.h" #include "feature.h" +#include "player-status.h" #include "player-move.h" +#include "player-effects.h" #include "monster.h" #include "monsterrace-hook.h" diff --git a/src/patron.c b/src/patron.c index 436499538..96b9dbed0 100644 --- a/src/patron.c +++ b/src/patron.c @@ -10,6 +10,7 @@ #include "mutation.h" #include "artifact.h" #include "player-status.h" +#include "player-effects.h" #include "spells.h" #include "spells-summon.h" diff --git a/src/player-damage.c b/src/player-damage.c index 77b335386..623364b91 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -5,6 +5,7 @@ #include "object-hook.h" #include "object-broken.h" #include "player-status.h" +#include "player-effects.h" /*! diff --git a/src/effects.c b/src/player-effects.c similarity index 99% rename from src/effects.c rename to src/player-effects.c index 1bc20fefa..22ee1b4cd 100644 --- a/src/effects.c +++ b/src/player-effects.c @@ -24,9 +24,11 @@ #include "wild.h" #include "spells-floor.h" #include "player-move.h" +#include "player-effects.h" #include "monster-status.h" #include "snipe.h" #include "files.h" +#include "player-effects.h" /*! * @brief プレイヤーの継続行動を設定する。 diff --git a/src/player-move.c b/src/player-move.c index 45935ddb8..8d121c2c4 100644 --- a/src/player-move.c +++ b/src/player-move.c @@ -148,6 +148,7 @@ #include "artifact.h" #include "player-move.h" #include "player-status.h" +#include "player-effects.h" #include "spells-floor.h" #include "feature.h" #include "warning.h" diff --git a/src/player-status.c b/src/player-status.c index ee496ee86..65893e529 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -15,6 +15,7 @@ #include "realm-hex.h" #include "cmd-pet.h" #include "cmd-spell.h" +#include "player-effects.h" /* Hack, monk armour */ static bool monk_armour_aux; diff --git a/src/racial.c b/src/racial.c index f4fde65f7..1bf843b27 100644 --- a/src/racial.c +++ b/src/racial.c @@ -20,6 +20,7 @@ #include "object-hook.h" #include "mutation.h" +#include "player-effects.h" #include "player-status.h" #include "spells-status.h" #include "spells-object.h" diff --git a/src/realm-arcane.c b/src/realm-arcane.c index 1a65f3a3b..aa9ef5d2b 100644 --- a/src/realm-arcane.c +++ b/src/realm-arcane.c @@ -8,6 +8,7 @@ #include "spells-summon.h" #include "spells-status.h" #include "player-status.h" +#include "player-effects.h" /*! * @brief 秘術領域魔法の各処理を行う diff --git a/src/realm-chaos.c b/src/realm-chaos.c index 6f97a2db0..0d60e6d48 100644 --- a/src/realm-chaos.c +++ b/src/realm-chaos.c @@ -1,5 +1,6 @@ #include "angband.h" #include "cmd-spell.h" +#include "player-effects.h" #include "spells-summon.h" #include "spells-status.h" #include "spells.h" diff --git a/src/realm-craft.c b/src/realm-craft.c index d09e50185..ada2e8a3c 100644 --- a/src/realm-craft.c +++ b/src/realm-craft.c @@ -6,6 +6,7 @@ #include "spells-status.h" #include "mutation.h" #include "player-status.h" +#include "player-effects.h" diff --git a/src/realm-crusade.c b/src/realm-crusade.c index fb5a9a4ca..7359c1426 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -4,6 +4,7 @@ #include "spells.h" #include "spells-summon.h" #include "spells-status.h" +#include "player-effects.h" diff --git a/src/realm-daemon.c b/src/realm-daemon.c index 4ab778c3e..7502bfaa0 100644 --- a/src/realm-daemon.c +++ b/src/realm-daemon.c @@ -5,6 +5,7 @@ #include "spells-summon.h" #include "spells-floor.h" #include "spells-status.h" +#include "player-effects.h" /*! * @brief 悪魔領域魔法の各処理を行う diff --git a/src/realm-death.c b/src/realm-death.c index 86faf7c3a..80053afcd 100644 --- a/src/realm-death.c +++ b/src/realm-death.c @@ -5,6 +5,7 @@ #include "spells-status.h" #include "avatar.h" #include "player-status.h" +#include "player-effects.h" diff --git a/src/realm-hex.c b/src/realm-hex.c index f85ab5a76..9491d1fd9 100644 --- a/src/realm-hex.c +++ b/src/realm-hex.c @@ -25,6 +25,7 @@ #include "spells-status.h" #include "spells.h" #include "player-status.h" +#include "player-effects.h" #include "realm-hex.h" #include "grid.h" diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c index 0ef87c92b..481f9eec4 100644 --- a/src/realm-hissatsu.c +++ b/src/realm-hissatsu.c @@ -8,6 +8,7 @@ #include "monster.h" #include "player-move.h" #include "player-status.h" +#include "player-effects.h" #include "feature.h" #include "spells.h" #include "grid.h" diff --git a/src/realm-life.c b/src/realm-life.c index ca363a41a..c574151e7 100644 --- a/src/realm-life.c +++ b/src/realm-life.c @@ -4,6 +4,7 @@ #include "spells-floor.h" #include "spells.h" #include "player-status.h" +#include "player-effects.h" /*! * @brief 生命領域魔法の各処理を行う diff --git a/src/realm-nature.c b/src/realm-nature.c index 5ee79b6ea..6896249b7 100644 --- a/src/realm-nature.c +++ b/src/realm-nature.c @@ -6,6 +6,7 @@ #include "spells-object.h" #include "avatar.h" #include "spells-floor.h" +#include "player-effects.h" /*! diff --git a/src/realm-song.c b/src/realm-song.c index d35ede026..bf6233a2d 100644 --- a/src/realm-song.c +++ b/src/realm-song.c @@ -3,6 +3,7 @@ #include "spells.h" #include "spells-status.h" #include "spells-floor.h" +#include "player-effects.h" /*! * @brief 歌の開始を処理する / Start singing if the player is a Bard diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c index f7c906f2c..c10c1d326 100644 --- a/src/realm-sorcery.c +++ b/src/realm-sorcery.c @@ -6,6 +6,7 @@ #include "spells.h" #include "spells-status.h" #include "spells-floor.h" +#include "player-effects.h" /*! * @brief 仙術領域魔法の各処理を行う diff --git a/src/realm-trump.c b/src/realm-trump.c index 6874dbeac..e5574339d 100644 --- a/src/realm-trump.c +++ b/src/realm-trump.c @@ -4,6 +4,7 @@ #include "spells.h" #include "spells-summon.h" #include "spells-status.h" +#include "player-effects.h" /*! diff --git a/src/spells-floor.c b/src/spells-floor.c index 6b3b76eda..7b5dddae5 100644 --- a/src/spells-floor.c +++ b/src/spells-floor.c @@ -5,6 +5,7 @@ #include "quest.h" #include "cmd-basic.h" #include "floor-save.h" +#include "player-effects.h" /* * Light up the dungeon using "clairvoyance" diff --git a/src/spells-object.c b/src/spells-object.c index 3851db18c..1f64ef0aa 100644 --- a/src/spells-object.c +++ b/src/spells-object.c @@ -9,6 +9,7 @@ #include "object-flavor.h" #include "player-status.h" #include "avatar.h" +#include "player-effects.h" typedef struct diff --git a/src/spells-status.c b/src/spells-status.c index 2ffea09df..b8b8a42ee 100644 --- a/src/spells-status.c +++ b/src/spells-status.c @@ -7,6 +7,7 @@ #include "spells.h" #include "monster.h" #include "cmd-spell.h" +#include "player-effects.h" /*! * @brief モンスター回復処理 diff --git a/src/spells1.c b/src/spells1.c index b0543b8b1..e62d0bad1 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -17,6 +17,7 @@ #include "trap.h" #include "object-curse.h" #include "player-damage.h" +#include "player-effects.h" #include "monster.h" #include "monster-status.h" diff --git a/src/spells2.c b/src/spells2.c index 6d76175fe..8838c5a27 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -33,6 +33,7 @@ #include "monster-status.h" #include "player-move.h" #include "player-status.h" +#include "player-effects.h" #include "floor-events.h" diff --git a/src/spells3.c b/src/spells3.c index 4321320a6..30b1d596f 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -33,6 +33,7 @@ #include "snipe.h" #include "floor-save.h" #include "files.h" +#include "player-effects.h" /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */ diff --git a/src/store.c b/src/store.c index 83a5fea06..a3a03b313 100644 --- a/src/store.c +++ b/src/store.c @@ -26,6 +26,7 @@ #include "floor-events.h" #include "snipe.h" #include "files.h" +#include "player-effects.h" #define MIN_STOCK 12 diff --git a/src/trap.c b/src/trap.c index 496d7f461..48885e9c2 100644 --- a/src/trap.c +++ b/src/trap.c @@ -2,6 +2,7 @@ #include "trap.h" #include "player-damage.h" #include "player-move.h" +#include "player-effects.h" #include "spells-summon.h" #include "quest.h" #include "artifact.h" diff --git a/src/wild.c b/src/wild.c index 0eb7a97ff..09a5ea3e7 100644 --- a/src/wild.c +++ b/src/wild.c @@ -17,6 +17,7 @@ #include "monster.h" #include "realm-hex.h" #include "player-status.h" +#include "player-effects.h" #include "grid.h" #include "monster-status.h" #include "quest.h" diff --git a/src/wizard2.c b/src/wizard2.c index 663c6c0f3..bf129e811 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -17,6 +17,7 @@ #include "quest.h" #include "artifact.h" #include "player-status.h" +#include "player-effects.h" #include "spells.h" #include "spells-object.h" -- 2.11.0