#37287 (2.2.0.89) C4774警告は抑止。型の置換を継続中。 / Suppress C4774 warning. Ongoing type replace...

diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj b/Hengband_vcs2015/Hengband/Hengband.vcxproj
index 3194b87..3b2598e 100644 (file)
--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj
@@ -69,7 +69,7 @@
       <WarningLevel>EnableAllWarnings</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4127;4244;4255;4668;4710;4820;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4127;4244;4255;4668;4710;4820;4996;4774;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r

diff --git a/src/init1.c b/src/init1.c
index d826303..4efb21f 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -4238,8 +4238,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                                q_ptr->k_idx   = (IDX)atoi(zz[8]);
                                q_ptr->dungeon = (DUNGEON_IDX)atoi(zz[9]);
 
-                               if (num > 10)
-                                       q_ptr->flags  = atoi(zz[10]);
+                               if (num > 10) q_ptr->flags  = atoi(zz[10]);
 
                                r_ptr = &r_info[q_ptr->r_idx];
                                if (r_ptr->flags1 & RF1_UNIQUE)

diff --git a/src/load.c b/src/load.c
index 7384020..b19f67e 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -2478,6 +2478,7 @@ static void rd_messages(void)
 {
        int i;
        char buf[128];
+       int message_max;
 
 
        if (h_older_than(2, 2, 0, 75))
@@ -2485,9 +2486,10 @@ static void rd_messages(void)
                u16b num;
                /* Total */
                rd_u16b(&num);
+               message_max = (int)num;
 
                /* Read the messages */
-               for (i = 0; i < num; i++)
+               for (i = 0; i < message_max; i++)
                {
                        /* Read the message */
                        rd_string(buf, sizeof(buf));
@@ -2501,9 +2503,10 @@ static void rd_messages(void)
                u32b num;
                /* Total */
                rd_u32b(&num);
+               message_max = (int)num;
 
                /* Read the messages */
-               for (i = 0; i < num; i++)
+               for (i = 0; i < message_max; i++)
                {
                        /* Read the message */
                        rd_string(buf, sizeof(buf));