#37287 cmd4.cとcmd5.c、cmd6.c内のC4457警告に対応。 / Deal C4457 warning in cmd4.c, cmd5.c and...

diff --git a/src/cmd4.c b/src/cmd4.c
index 7db4847..16e0464 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -1858,14 +1858,10 @@ void do_cmd_options_aux(int page, cptr info)
 static void do_cmd_options_win(void)
 {
        int i, j, d;
 static void do_cmd_options_win(void)
 {
        int i, j, d;

-

        int y = 0;
        int x = 0;
        int y = 0;
        int x = 0;

-

        char ch;
        char ch;

-

        bool go = TRUE;
        bool go = TRUE;

-

        u32b old_flag[8];
 
 
        u32b old_flag[8];
 
 


@@ -1919,9 +1915,8 @@ static void do_cmd_options_win(void)
                        /* Display the windows */
                        for (j = 0; j < 8; j++)
                        {
                        /* Display the windows */
                        for (j = 0; j < 8; j++)
                        {

-                               byte a = TERM_WHITE;
-

                                char c = '.';
                                char c = '.';

+                               a = TERM_WHITE;

 
                                /* Use color */
                                if ((i == y) && (j == x)) a = TERM_L_BLUE;
 
                                /* Use color */
                                if ((i == y) && (j == x)) a = TERM_L_BLUE;

diff --git a/src/cmd5.c b/src/cmd5.c
index 872fcaf..ea9ca33 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -2176,8 +2176,6 @@ static void do_name_pet(void)
                                m_ptr->nickname = quark_add(out_val);
                                if (record_named_pet)
                                {
                                m_ptr->nickname = quark_add(out_val);
                                if (record_named_pet)
                                {

-                                       char m_name[80];
-

                                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);
                                }
                                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);
                                }


@@ -2186,8 +2184,6 @@ static void do_name_pet(void)
                        {
                                if (record_named_pet && old_name)
                                {
                        {
                                if (record_named_pet && old_name)
                                {

-                                       char m_name[80];
-

                                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);
                                }
                                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);
                                }

diff --git a/src/cmd6.c b/src/cmd6.c
index 4d21d6b..cc125d5 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -3835,7 +3835,7 @@ static void do_cmd_activate_aux(int item)
                }
                else
                {
                }
                else
                {

-                       bool success = FALSE;
+                       success = FALSE;

                        if (!get_rep_dir2(&dir)) return;
                        if (monster_can_enter(p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], &r_info[o_ptr->pval], 0))
                        {
                        if (!get_rep_dir2(&dir)) return;
                        if (monster_can_enter(p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], &r_info[o_ptr->pval], 0))
                        {