#37287 (2.2.0.89) C4706警告にエンバグを修正しつつ対応。 / Fix C4706 warning with correcting new bug.

diff --git a/src/readdib.c b/src/readdib.c
index aacf4f1..b3a493d 100644 (file)
--- a/src/readdib.c
+++ b/src/readdib.c
@@ -273,7 +273,8 @@ BOOL ReadDIB(HWND hWnd, LPSTR lpFileName, DIBINIT *pInfo)
                        goto ErrExit;
        }
 
-       if (!(nNumColors == (WORD)lpbi->biClrUsed))
+       nNumColors = (WORD)lpbi->biClrUsed;
+       if (!nNumColors)
        {
                /* no color table for 24-bit, default size otherwise */
                if (lpbi->biBitCount != 24)

diff --git a/src/util.c b/src/util.c
index 77758d6..26f8ff1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1322,7 +1322,7 @@ static bool trigger_ascii_to_text(char **bufptr, cptr *strptr)
                switch(ch)
                {
                case '&':
-                       while ((tmp = my_strchr(macro_modifier_chr, *str)))
+                       while ((tmp = my_strchr(macro_modifier_chr, *str)) != 0)
                        {
                                j = (int)(tmp - macro_modifier_chr);
                                tmp = macro_modifier_name[j];

diff --git a/src/xtra2.c b/src/xtra2.c
index a80ceff..0882e5c 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -3889,7 +3889,7 @@ bool target_set(int mode)
                        strcpy(info, _("q止 t決 p自 m近 +次 -前", "q,t,p,m,+,-,<dir>"));
 
                        /* Describe and Prompt (enable "TARGET_LOOK") */
-                       while (!(query = target_set_aux(y, x, mode | TARGET_LOOK, info)));
+                       while ((query = target_set_aux(y, x, mode | TARGET_LOOK, info)) == 0);
 
                        /* Cancel tracking */
                        /* health_track(0); */