• R/O
  • HTTP
  • SSH
  • HTTPS

hengbandosx: 提交

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.


Commit MetaInfo

修订版71389884b68b1589d926b3250a5f90bc56c4a697 (tree)
时间2022-09-28 06:36:51
作者Eric Branlund <ebranlund@fast...>
CommiterEric Branlund

Log Message

Merge branch 'develop' into macos-develop

更改概述

差异

--- a/doxygen/Hengband.doxyfile
+++ b/doxygen/Hengband.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = Hengband
3838 # could be handy for archiving the generated documentation or if some version
3939 # control system is used.
4040
41-PROJECT_NUMBER = 3.0.0Alpha66
41+PROJECT_NUMBER = 3.0.0Alpha68
4242
4343 # Using the PROJECT_BRIEF tag one can provide an optional one line description
4444 # for a project that appears at the top of each page and should give viewer a
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -13,7 +13,7 @@
1313
1414 # N:<index>:<name>
1515 # D:<long name>
16-# W:<min depth>:<min depth>:<min player level>:<flags mode>:<min alloc>:<max alloc chance>:<obj good>:<obj great>:<pit>:<nest>
16+# W:<min depth>:<max depth>:<min player level>:<flags mode>:<min alloc>:<max alloc chance>:<obj good>:<obj great>:<pit>:<nest>
1717 # L:<floor1>:<%1>:<floor2>:<%2>:<floor3>:<%3>:<tunnel%>
1818 # A:<wall1>:<%1>:<wall2>:<%2>:<wall3>:<%3>:<outer wall>:<inner wall>:<stream1>:<stream2>
1919 # F:<flags>
--- a/src/effect/effect-player-resist-hurt.cpp
+++ b/src/effect/effect-player-resist-hurt.cpp
@@ -446,7 +446,7 @@ void effect_player_dark(PlayerType *player_ptr, EffectPlayerType *ep_ptr)
446446
447447 ep_ptr->dam = ep_ptr->dam * calc_dark_damage_rate(player_ptr, CALC_RAND) / 100;
448448
449- auto go_blind = is_blind;
449+ auto go_blind = !is_blind;
450450 go_blind &= !has_resist_blind(player_ptr);
451451 go_blind &= !(has_resist_dark(player_ptr) || has_immune_dark(player_ptr));
452452 go_blind &= !check_multishadow(player_ptr);
--- a/src/melee/melee-spell-flags-checker.cpp
+++ b/src/melee/melee-spell-flags-checker.cpp
@@ -88,8 +88,6 @@ static bool check_melee_spell_projection(PlayerType *player_ptr, melee_spell_typ
8888 start = floor_ptr->m_max + 1;
8989 }
9090
91- const auto &m_ref = *ms_ptr->m_ptr;
92- const auto &t_ref = *ms_ptr->t_ptr;
9391 for (int i = start; ((i < start + floor_ptr->m_max) && (i > start - floor_ptr->m_max)); i += plus) {
9492 MONSTER_IDX dummy = (i % floor_ptr->m_max);
9593 if (!dummy) {
@@ -98,6 +96,8 @@ static bool check_melee_spell_projection(PlayerType *player_ptr, melee_spell_typ
9896
9997 ms_ptr->target_idx = dummy;
10098 ms_ptr->t_ptr = &floor_ptr->m_list[ms_ptr->target_idx];
99+ const auto &m_ref = *ms_ptr->m_ptr;
100+ const auto &t_ref = *ms_ptr->t_ptr;
101101 const auto is_enemies = are_enemies(player_ptr, m_ref, t_ref);
102102 const auto is_projectable = projectable(player_ptr, m_ref.fy, m_ref.fx, t_ref.fy, t_ref.fx);
103103 if (!t_ref.is_valid() || (ms_ptr->m_idx == ms_ptr->target_idx) || !is_enemies || !is_projectable) {
--- a/src/spell-class/spells-mirror-master.cpp
+++ b/src/spell-class/spells-mirror-master.cpp
@@ -471,6 +471,10 @@ void SpellsMirrorMaster::project_super_ray(int target_x, int target_y, int dam)
471471 std::vector<projection_path> second_path_g_list;
472472 handle_stuff(this->player_ptr);
473473
474+ if (path_g.path_num() == 0) {
475+ return;
476+ }
477+
474478 project_m_n = 0;
475479 project_m_x = 0;
476480 project_m_y = 0;
--- a/src/system/angband-version.h
+++ b/src/system/angband-version.h
@@ -23,7 +23,7 @@ constexpr std::string_view ROOT_VARIANT_NAME("Hengband");
2323 #define H_VER_MAJOR 3 //!< ゲームのバージョン定義(メジャー番号)
2424 #define H_VER_MINOR 0 //!< ゲームのバージョン定義(マイナー番号)
2525 #define H_VER_PATCH 0 //!< ゲームのバージョン定義(パッチ番号)
26-#define H_VER_EXTRA 67 //!< ゲームのバージョン定義(エクストラ番号)
26+#define H_VER_EXTRA 68 //!< ゲームのバージョン定義(エクストラ番号)
2727
2828 /*!
2929 * @brief セーブファイルのバージョン(3.0.0から導入)
Show on old repository browser