#37287 #37353 (2.2.0.89) 型の置換を継続中。プロジェクト外ヘッダファイルが起こしている警告を抑止。Doxygen設定ファイルのバージョン表記変更...

diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj b/Hengband_vcs2015/Hengband/Hengband.vcxproj
index 23ae2bf..3194b87 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;4710;4996;4244;4820;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4127;4244;4255;4668;4710;4820;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r

diff --git a/doxygen/Hengband.doxyfile b/doxygen/Hengband.doxyfile
index 09663da..fe7fbbf 100644 (file)
--- a/doxygen/Hengband.doxyfile
+++ b/doxygen/Hengband.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Hengband
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.1.4
+PROJECT_NUMBER         = 2.2.0-FixWinWarnings
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/src/defines.h b/src/defines.h
index c2f4f37..f5dfe20 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -334,9 +334,9 @@
 
 
 
-# define MAX_MA 17 /*!< 修行僧マーシャルアーツの技数 / Monk martial arts... */
-# define MA_KNEE 1 /*!< 金的効果ID */
-# define MA_SLOW 2 /*!< 膝蹴り効果ID */
+#define MAX_MA 17 /*!< 修行僧マーシャルアーツの技数 / Monk martial arts... */
+#define MA_KNEE 1 /*!< 金的効果ID */
+#define MA_SLOW 2 /*!< 膝蹴り効果ID */
 
 #define MAX_MIND_POWERS  21 /*!< 超能力の数 / Mindcraft */
 

diff --git a/src/init1.c b/src/init1.c
index 7167830..5004af9 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -4229,7 +4229,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
 
                                if (num < 9) return (PARSE_ERROR_TOO_FEW_ARGUMENTS);
 
-                               q_ptr->type    = atoi(zz[2]);
+                               q_ptr->type    = (QUEST_TYPE)atoi(zz[2]);
                                q_ptr->num_mon = (MONSTER_NUMBER)atoi(zz[3]);
                                q_ptr->cur_num = (MONSTER_NUMBER)atoi(zz[4]);
                                q_ptr->max_num = (MONSTER_NUMBER)atoi(zz[5]);

diff --git a/src/spells2.c b/src/spells2.c
index 7a01137..363723a 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3169,9 +3169,9 @@ bool mass_genocide_undead(int power, bool player_cast)
  */
 bool probing(void)
 {
-       int     i, speed;
-       int cu, cv;
-       bool    probe = FALSE;
+       int i, speed;
+       bool_hack cu, cv;
+       bool probe = FALSE;
        char buf[256];
        cptr align;