The master and develop branches track hengband.
OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.
| Revisão | a5decc41763090ca11033a35eddb3632031c85d2 (tree) |
|---|---|
| Hora | 2021-03-29 18:49:07 |
| Autor | Deskull <61610939+sikabane-works@user...> |
| Commiter | GitHub |
Merge pull request #655 from sikabane-works/release/3.0.0Alpha15
Release/3.0.0 alpha15
doxygen/Hengband.doxyfile (diff)
lib/edit/t0000001.txt (diff)
src/load/monster-loader.cpp (diff)
src/system/angband-version.h (diff)| @@ -38,7 +38,7 @@ PROJECT_NAME = Hengband | ||
| 38 | 38 | # could be handy for archiving the generated documentation or if some version |
| 39 | 39 | # control system is used. |
| 40 | 40 | |
| 41 | -PROJECT_NUMBER = 3.0.0Alpha14 | |
| 41 | +PROJECT_NUMBER = 3.0.0Alpha15 | |
| 42 | 42 | |
| 43 | 43 | # Using the PROJECT_BRIEF tag one can provide an optional one line description |
| 44 | 44 | # for a project that appears at the top of each page and should give viewer a |
| @@ -136,7 +136,6 @@ F:!:FLOOR:3:0:75 | ||
| 136 | 136 | # Continue with quest 18 |
| 137 | 137 | ?:[EQU $QUEST14 4] |
| 138 | 138 | F:b:BUILDING_1:3:0:0:0:0:NONE:18 |
| 139 | -F:!:FLOOR:3:0:75 | |
| 140 | 139 | |
| 141 | 140 | # Continue with quest 18 |
| 142 | 141 | ?:[EQU $QUEST14 6] |
| @@ -109,6 +109,9 @@ void rd_monster(player_type *player_ptr, monster_type *m_ptr) | ||
| 109 | 109 | } else |
| 110 | 110 | m_ptr->mtimed[MTIMED_INVULNER] = 0; |
| 111 | 111 | |
| 112 | + m_ptr->mflag.clear(); | |
| 113 | + m_ptr->mflag2.clear(); | |
| 114 | + | |
| 112 | 115 | if (flags & SAVE_MON_SMART) { |
| 113 | 116 | if (loading_savefile_version_is_older_than(2)) { |
| 114 | 117 | u32b tmp32u; |
| @@ -139,9 +142,6 @@ void rd_monster(player_type *player_ptr, monster_type *m_ptr) | ||
| 139 | 142 | } else |
| 140 | 143 | m_ptr->exp = 0; |
| 141 | 144 | |
| 142 | - m_ptr->mflag.clear(); | |
| 143 | - m_ptr->mflag2.clear(); | |
| 144 | - | |
| 145 | 145 | if (flags & SAVE_MON_MFLAG2) { |
| 146 | 146 | if (loading_savefile_version_is_older_than(2)) { |
| 147 | 147 | rd_byte(&tmp8u); |
| @@ -17,7 +17,7 @@ | ||
| 17 | 17 | #define H_VER_MAJOR 3 //!< ゲームのバージョン定義(メジャー番号) |
| 18 | 18 | #define H_VER_MINOR 0 //!< ゲームのバージョン定義(マイナー番号) |
| 19 | 19 | #define H_VER_PATCH 0 //!< ゲームのバージョン定義(パッチ番号) |
| 20 | -#define H_VER_EXTRA 14 //!< ゲームのバージョン定義(エクストラ番号) | |
| 20 | +#define H_VER_EXTRA 15 //!< ゲームのバージョン定義(エクストラ番号) | |
| 21 | 21 | |
| 22 | 22 | /*! |
| 23 | 23 | * @brief セーブファイルのバージョン(3.0.0から導入) |
Fork