Merge remote-tracking branch 'remotes/origin/MERFOLK'

[hengband/hengband.git] / src / cmd1.c

diff --git a/src/cmd1.c b/src/cmd1.c
index c78e626..7b18fc4 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -140,6 +140,7 @@
  */
 
 #include "angband.h"
+#include "melee.h"
 #include "trap.h"
 
 
@@ -284,8 +285,6 @@ HIT_POINT tot_dam_aux(object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, B
        MULTIPLY mult = 10;
 
        BIT_FLAGS flgs[TR_FLAG_SIZE];
-
-       /* Extract the flags */
        object_flags(o_ptr, flgs);
        torch_flags(o_ptr, flgs); /* torches has secret flags */
 
@@ -458,12 +457,12 @@ void py_pickup_aux(OBJECT_IDX o_idx)
        INVENTORY_IDX slot;
 
 #ifdef JP
-       char o_name[MAX_NLEN];
-       char old_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
+       GAME_TEXT old_name[MAX_NLEN];
        char kazu_str[80];
        int hirottakazu;
 #else
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 #endif
 
        object_type *o_ptr;
@@ -546,7 +545,7 @@ void carry(bool pickup)
 
        OBJECT_IDX this_o_idx, next_o_idx = 0;
 
-       char    o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Recenter the map around the player */
        verify_panel();
@@ -794,19 +793,17 @@ bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x)
  * @param mode 移動に関するオプションフラグ
  * @return 移動可能ならばTRUEを返す
  */
-bool player_can_enter(s16b feature, u16b mode)
+bool player_can_enter(FEAT_IDX feature, BIT_FLAGS16 mode)
 {
        feature_type *f_ptr = &f_info[feature];
 
        if (p_ptr->riding) return monster_can_cross_terrain(feature, &r_info[m_list[p_ptr->riding].r_idx], mode | CEM_RIDING);
 
-       /* Pattern */
        if (have_flag(f_ptr->flags, FF_PATTERN))
        {
                if (!(mode & CEM_P_CAN_ENTER_PATTERN)) return FALSE;
        }
 
-       /* "CAN" flags */
        if (have_flag(f_ptr->flags, FF_CAN_FLY) && p_ptr->levitation) return TRUE;
        if (have_flag(f_ptr->flags, FF_CAN_SWIM) && p_ptr->can_swim) return TRUE;
        if (have_flag(f_ptr->flags, FF_CAN_PASS) && p_ptr->pass_wall) return TRUE;
@@ -866,10 +863,7 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
                        }
                }
 
-               /* Redraw old spot */
                lite_spot(oy, ox);
-
-               /* Redraw new spot */
                lite_spot(ny, nx);
 
                /* Check for new panel (redraw map) */
@@ -879,9 +873,7 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
                {
                        forget_flow();
 
-                       /* Mega-Hack -- Forget the view */
                        p_ptr->update |= (PU_UN_VIEW);
-
                        p_ptr->redraw |= (PR_MAP);
                }
 
@@ -908,13 +900,12 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
                        msg_print(_("ここでは素早く動けない。", "You cannot run in here."));
                        set_action(ACTION_NONE);
                }
-
                if (p_ptr->prace == RACE_MERFOLK)
                {
                        if(have_flag(f_ptr->flags, FF_WATER) ^ have_flag(of_ptr->flags, FF_WATER))
                        {
                                p_ptr->update |= PU_BONUS;
-                               update_stuff();
+                               update_creature(p_ptr);
                        }
                }
        }
@@ -1123,7 +1114,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
        monster_type *riding_m_ptr = &m_list[p_ptr->riding];
        monster_race *riding_r_ptr = &r_info[p_ptr->riding ? riding_m_ptr->r_idx : 0]; /* Paranoia */
 
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        bool p_can_enter = player_can_enter(c_ptr->feat, CEM_P_CAN_ENTER_PATTERN);
        bool p_can_kill_walls = FALSE;
@@ -1296,7 +1287,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                }
                else if (MON_MONFEAR(riding_m_ptr))
                {
-                       char steed_name[80];
+                       GAME_TEXT steed_name[MAX_NLEN];
                        monster_desc(steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name);
                        oktomove = FALSE;
@@ -1341,7 +1332,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
 
                if (oktomove && MON_STUNNED(riding_m_ptr) && one_in_(2))
                {
-                       char steed_name[80];
+                       GAME_TEXT steed_name[MAX_NLEN];
                        monster_desc(steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが朦朧としていてうまく動けない！", "You cannot control stunned %s!"), steed_name);
                        oktomove = FALSE;
@@ -1389,7 +1380,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                /* Feature code (applying "mimic" field) */
                FEAT_IDX feat = get_feat_mimic(c_ptr);
                feature_type *mimic_f_ptr = &f_info[feat];
-               cptr name = f_name + mimic_f_ptr->name;
+               concptr name = f_name + mimic_f_ptr->name;
 
                oktomove = FALSE;