[Refactor] #38844 is_loading_now を world_type 構造体へ移動．

[hengband/hengband.git] / src / player-status.c

diff --git a/src/player-status.c b/src/player-status.c
index a4e73bc..fb2f560 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -29,6 +29,9 @@
 #include "objectkind.h"
 #include "monsterrace.h"
 #include "autopick.h"
+#include "cmd-dump.h"
+#include "melee.h"
+#include "world.h"
 
 /*!
  * @var horror_desc
@@ -2811,7 +2814,7 @@ void calc_bonuses(void)
                        if (p_ptr->icky_wield[i])
                        {
                                msg_print(_("今の装備はどうも自分にふさわしくない気がする。", "You do not feel comfortable with your weapon."));
-                               if (is_loading_now)
+                               if (current_world_ptr->is_loading_now)
                                {
                                        chg_virtue(V_FAITH, -1);
                                }
@@ -2857,7 +2860,7 @@ void calc_bonuses(void)
                if (heavy_armor())
                {
                        msg_print(_("装備が重くてバランスを取れない。", "The weight of your armor disrupts your balance."));
-                       if (is_loading_now)
+                       if (current_world_ptr->is_loading_now)
                        {
                                chg_virtue(V_HARMONY, -1);
                        }
@@ -4230,7 +4233,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
                }
                else power *= 2;
 
-               if (!is_loading_now)
+               if (!current_world_ptr->is_loading_now)
                        return; /* No effect yet, just loaded... */
 
                if (!m_ptr->ml)