Merge pull request #655 from sikabane-works/release/3.0.0Alpha15

Release/3.0.0 alpha15

diff --git a/doxygen/Hengband.doxyfile b/doxygen/Hengband.doxyfile
index f1b3562..e12d117 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         = 3.0.0Alpha14
+PROJECT_NUMBER         = 3.0.0Alpha15
 
 # 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/lib/edit/t0000001.txt b/lib/edit/t0000001.txt
index ed08b0c..4fa47ec 100644 (file)
--- a/lib/edit/t0000001.txt
+++ b/lib/edit/t0000001.txt
@@ -136,7 +136,6 @@ F:!:FLOOR:3:0:75
 # Continue with quest 18
 ?:[EQU $QUEST14 4]
 F:b:BUILDING_1:3:0:0:0:0:NONE:18
-F:!:FLOOR:3:0:75
 
 # Continue with quest 18
 ?:[EQU $QUEST14 6]

diff --git a/src/load/monster-loader.cpp b/src/load/monster-loader.cpp
index a0cb59d..8ab3371 100644 (file)
--- a/src/load/monster-loader.cpp
+++ b/src/load/monster-loader.cpp
@@ -109,6 +109,9 @@ void rd_monster(player_type *player_ptr, monster_type *m_ptr)
     } else
         m_ptr->mtimed[MTIMED_INVULNER] = 0;
 
+    m_ptr->mflag.clear();
+    m_ptr->mflag2.clear();
+
     if (flags & SAVE_MON_SMART) {
         if (loading_savefile_version_is_older_than(2)) {
             u32b tmp32u;
@@ -139,9 +142,6 @@ void rd_monster(player_type *player_ptr, monster_type *m_ptr)
     } else
         m_ptr->exp = 0;
 
-    m_ptr->mflag.clear();
-    m_ptr->mflag2.clear();
-
     if (flags & SAVE_MON_MFLAG2) {
         if (loading_savefile_version_is_older_than(2)) {
             rd_byte(&tmp8u);

diff --git a/src/system/angband-version.h b/src/system/angband-version.h
index 4927fc4..cb52bfc 100644 (file)
--- a/src/system/angband-version.h
+++ b/src/system/angband-version.h
@@ -17,7 +17,7 @@
 #define H_VER_MAJOR  3 //!< ゲームのバージョン定義(メジャー番号)
 #define H_VER_MINOR  0 //!< ゲームのバージョン定義(マイナー番号)
 #define H_VER_PATCH  0 //!< ゲームのバージョン定義(パッチ番号)
-#define H_VER_EXTRA 14 //!< ゲームのバージョン定義(エクストラ番号)
+#define H_VER_EXTRA 15 //!< ゲームのバージョン定義(エクストラ番号)
 
 /*!
  * @brief セーブファイルのバージョン(3.0.0から導入)