OSDN Git Service

[Refactor] #38997 place_extra_bold() を削除し、place_grid() に統合 / Removed place_extra_bold...
[hengband/hengband.git] / src / player-move.c
index 59a5a1d..691a3b2 100644 (file)
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-inventory.h"
 #include "player-personality.h"
 #include "spells-floor.h"
 #include "feature.h"
@@ -354,7 +355,7 @@ void py_pickup_aux(player_type *owner_ptr, OBJECT_IDX o_idx)
 void carry(player_type *creature_ptr, bool pickup)
 {
        /* Recenter the map around the player */
-       verify_panel();
+       verify_panel(creature_ptr);
 
        creature_ptr->update |= (PU_MONSTERS);
        creature_ptr->redraw |= (PR_MAP);
@@ -623,7 +624,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
                lite_spot(ny, nx);
 
                /* Check for new panel (redraw map) */
-               verify_panel();
+               verify_panel(creature_ptr);
 
                if (mpe_mode & MPE_FORGET_FLOW)
                {
@@ -994,7 +995,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                        /* Disturb the monster */
                        (void)set_monster_csleep(creature_ptr, g_ptr->m_idx, 0);
 
-                       monster_desc(m_name, m_ptr, 0);
+                       monster_desc(creature_ptr, m_name, m_ptr, 0);
 
                        if (m_ptr->ml)
                        {
@@ -1043,7 +1044,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                else if (MON_MONFEAR(riding_m_ptr))
                {
                        GAME_TEXT steed_name[MAX_NLEN];
-                       monster_desc(steed_name, riding_m_ptr, 0);
+                       monster_desc(creature_ptr, steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name);
                        can_move = FALSE;
                        disturb(creature_ptr, FALSE, TRUE);
@@ -1088,7 +1089,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                if (can_move && MON_STUNNED(riding_m_ptr) && one_in_(2))
                {
                        GAME_TEXT steed_name[MAX_NLEN];
-                       monster_desc(steed_name, riding_m_ptr, 0);
+                       monster_desc(creature_ptr, steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが朦朧としていてうまく動けない!", "You cannot control stunned %s!"), steed_name);
                        can_move = FALSE;
                        disturb(creature_ptr, FALSE, TRUE);
@@ -2247,7 +2248,7 @@ void disturb(player_type *creature_ptr, bool stop_search, bool stop_travel)
                creature_ptr->running = 0;
 
                /* Check for new panel if appropriate */
-               if (center_player && !center_running) verify_panel();
+               if (center_player && !center_running) verify_panel(creature_ptr);
 
                /* Calculate torch radius */
                creature_ptr->update |= (PU_TORCH);
@@ -2263,7 +2264,7 @@ void disturb(player_type *creature_ptr, bool stop_search, bool stop_travel)
                travel.run = 0;
 
                /* Check for new panel if appropriate */
-               if (center_player && !center_running) verify_panel();
+               if (center_player && !center_running) verify_panel(creature_ptr);
 
                /* Calculate torch radius */
                creature_ptr->update |= (PU_TORCH);