Merge pull request #46040 from Aivean/fix-walk-on-boat

Fix walking on boat immediately after game is loaded
CleverRaven · Dec 14, 2020 · 6b6b655 · 6b6b655
2 parents abf2fc3 + 739ac4f
commit 6b6b655
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
@@ -340,8 +340,8 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d )
     bool toDeepWater = m.has_flag( TFLAG_DEEP_WATER, dest_loc );
     bool fromSwimmable = m.has_flag( flag_SWIMMABLE, you.pos() );
     bool fromDeepWater = m.has_flag( TFLAG_DEEP_WATER, you.pos() );
-    bool fromBoat = veh0 != nullptr && veh0->is_in_water();
-    bool toBoat = veh1 != nullptr && veh1->is_in_water();
+    bool fromBoat = veh0 != nullptr && veh0->is_in_water( fromDeepWater );
+    bool toBoat = veh1 != nullptr && veh1->is_in_water( toDeepWater );
     if( is_riding ) {
         if( !you.check_mount_will_move( dest_loc ) ) {
             if( you.is_auto_moving() ) {