branch-hexの変更をコミット。

[hengband/hengband.git] / src / cave.c

diff --git a/src/cave.c b/src/cave.c
index e163283..aa90ad0 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -4502,7 +4502,7 @@ void wiz_dark(void)
                if (o_ptr->held_m_idx) continue;
 
                /* Forget the object */
-               o_ptr->marked = 0;
+               o_ptr->marked &= OM_TOUCHED;
        }
 
        /* Mega-Hack -- Forget the view and lite */
@@ -5044,6 +5044,20 @@ void disturb(int stop_search, int unused_flag)
                p_ptr->update |= (PU_FLOW);
        }
 
+#ifdef TRAVEL
+       if (travel.run)
+       {
+               /* Cancel */
+               travel.run = 0;
+
+               /* Check for new panel if appropriate */
+               if (center_player && !center_running) verify_panel();
+
+               /* Calculate torch radius */
+               p_ptr->update |= (PU_TORCH);
+       }
+#endif
+
        /* Flush the input if requested */
        if (flush_disturb) flush();
 }