#37287 init1.cとmelee2.c、monster2.c内のC4457警告に対応 / Deal C4457 warning in init1.c, melee...

diff --git a/src/init1.c b/src/init1.c
index f3b4c60..a4ff403 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -2162,7 +2162,6 @@ errr parse_k_info(char *buf, header *head)
        /* Process 'A' for "Allocation" (one line only) */
        else if (buf[0] == 'A')
        {
        /* Process 'A' for "Allocation" (one line only) */
        else if (buf[0] == 'A')
        {

-               int i;

 
                /* XXX XXX XXX Simply read each number following a colon */
                for (i = 0, s = buf+1; s && (s[0] == ':') && s[1]; ++i)
 
                /* XXX XXX XXX Simply read each number following a colon */
                for (i = 0, s = buf+1; s && (s[0] == ':') && s[1]; ++i)


@@ -4259,16 +4258,16 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                                /* Place player in a quest level */
                                if (p_ptr->inside_quest)
                                {
                                /* Place player in a quest level */
                                if (p_ptr->inside_quest)
                                {

-                                       int y, x;
+                                       int py, px;

 
                                        /* Delete the monster (if any) */
                                        delete_monster(p_ptr->y, p_ptr->x);
 
 
                                        /* Delete the monster (if any) */
                                        delete_monster(p_ptr->y, p_ptr->x);
 

-                                       y = atoi(zz[0]);
-                                       x = atoi(zz[1]);
+                                       py = atoi(zz[0]);
+                                       px = atoi(zz[1]);

 
 

-                                       p_ptr->y = y;
-                                       p_ptr->x = x;
+                                       p_ptr->y = py;
+                                       p_ptr->x = px;

                                }
                                /* Place player in the town */
                                else if (!p_ptr->oldpx && !p_ptr->oldpy)
                                }
                                /* Place player in the town */
                                else if (!p_ptr->oldpx && !p_ptr->oldpy)

diff --git a/src/melee2.c b/src/melee2.c
index d9a7e00..fa7d673 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -362,8 +362,6 @@ void mon_take_hit_mon(int m_idx, int dam, bool *fear, cptr note, int who)
 
        if (p_ptr->riding && (p_ptr->riding == m_idx) && (dam > 0))
        {
 
        if (p_ptr->riding && (p_ptr->riding == m_idx) && (dam > 0))
        {

-               char m_name[80];
-

                /* Extract monster name */
                monster_desc(m_name, m_ptr, 0);
 
                /* Extract monster name */
                monster_desc(m_name, m_ptr, 0);
 

diff --git a/src/monster2.c b/src/monster2.c
index 4e548e7..e653f73 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1964,8 +1964,8 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 
        if (!necro && m_ptr)
        {
 
        if (!necro && m_ptr)
        {

-               char            m_name[80];
-               monster_race    *r_ptr = &r_info[m_ptr->ap_r_idx];
+               char m_name[80];
+               monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];

 
                power = r_ptr->level / 2;
 
 
                power = r_ptr->level / 2;
 


@@ -1987,8 +1987,6 @@ void sanity_blast(monster_type *m_ptr, bool necro)
                if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR))
                        return; /* oops */
 
                if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR))
                        return; /* oops */
 

-
-

                if (is_pet(m_ptr))
                        return; /* Pet eldritch horrors are safe most of the time */
 
                if (is_pet(m_ptr))
                        return; /* Pet eldritch horrors are safe most of the time */
 


@@ -2010,7 +2008,6 @@ void sanity_blast(monster_type *m_ptr, bool necro)
                                funny_desc[randint0(MAX_SAN_FUNNY)], m_name);
 #endif
 
                                funny_desc[randint0(MAX_SAN_FUNNY)], m_name);
 #endif
 

-

                        if (one_in_(3))
                        {
                                msg_print(funny_comments[randint0(MAX_SAN_COMMENT)]);
                        if (one_in_(3))
                        {
                                msg_print(funny_comments[randint0(MAX_SAN_COMMENT)]);


@@ -2046,7 +2043,6 @@ void sanity_blast(monster_type *m_ptr, bool necro)
        else if(!necro)
        {
                monster_race *r_ptr;
        else if(!necro)
        {
                monster_race *r_ptr;

-               int power;

                char m_name[80];
                cptr desc;
 
                char m_name[80];
                cptr desc;