Merge pull request #2469 from habu1010/feature/fix-refill-by-oil-flask

[Fix] 油つぼからランタンの燃料補給ができなくなる

diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index c116f69..67e8a3d 100644 (file)
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -230,8 +230,8 @@ bool process_un_power(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr)
     object_kind *kind_ptr = &k_info[monap_ptr->o_ptr->k_idx];
     PARAMETER_VALUE pval = kind_ptr->pval;
     DEPTH level = monap_ptr->rlev;
-    int drain = is_magic_mastery ? std::min<short>(pval, pval * level / 400 + pval * randint1(level) / 400) : pval;
-    drain = std::min<short>(drain, monap_ptr->o_ptr->pval);
+    auto drain = is_magic_mastery ? std::min<short>(pval, pval * level / 400 + pval * randint1(level) / 400) : pval;
+    drain = std::min(drain, monap_ptr->o_ptr->pval);
     if (drain <= 0) {
         return false;
     }

diff --git a/src/spell-class/spells-mirror-master.cpp b/src/spell-class/spells-mirror-master.cpp
index 2a6affc..4a03b6a 100644 (file)
--- a/src/spell-class/spells-mirror-master.cpp
+++ b/src/spell-class/spells-mirror-master.cpp
@@ -255,8 +255,10 @@ void SpellsMirrorMaster::next_mirror(int *next_y, int *next_x, int cury, int cur
         return;
     }
 
-    *next_y = cury + randint0(5) - 2;
-    *next_x = curx + randint0(5) - 2;
+    do {
+        *next_y = cury + randint0(5) - 2;
+        *next_x = curx + randint0(5) - 2;
+    } while ((*next_y == cury) && (*next_x == curx));
 }
 
 void SpellsMirrorMaster::project_seeker_ray(int target_x, int target_y, int dam)