Merge pull request #76396 from ShnitzelX2/fast-travel-fix

Fixes fast travel overmap UI when failing to reach destination
CleverRaven · Sep 13, 2024 · 0221f6e · 0221f6e
2 parents 2473620 + c3d5b83
commit 0221f6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
@@ -2929,7 +2929,8 @@ void activity_handlers::travel_do_turn( player_activity *act, Character *you )
             const activity_id act_travel = ACT_TRAVELLING;
             you->set_destination( route_to, player_activity( act_travel ) );
         } else {
-            you->add_msg_if_player( _( "You cannot reach that destination" ) );
+            you->add_msg_if_player( m_warning, _( "You cannot reach that destination." ) );
+            ui::omap::force_quit();
         }
     } else {
         you->add_msg_if_player( m_info, _( "You have reached your destination." ) );

diff --git a/src/vehicle_autodrive.cpp b/src/vehicle_autodrive.cpp
@@ -1377,7 +1377,7 @@ autodrive_result vehicle::do_autodrive( Character &driver )
     std::optional<navigation_step> next_step = active_autodrive_controller->compute_next_step();
     if( !next_step ) {
         // message handles pathfinding failure either due to obstacles or inability to see
-        driver.add_msg_if_player( _( "Can't see a path forward." ) );
+        driver.add_msg_if_player( m_warning, _( "Can't see a path forward." ) );
         stop_autodriving( false );
         return autodrive_result::abort;
     }