From 739ac4f8ee39ab6462499f882feb5e6b43fe4ee0 Mon Sep 17 00:00:00 2001 From: Aivean Date: Sun, 13 Dec 2020 18:37:08 -0800 Subject: [PATCH] fix walking on boat immediately after game is loaded --- src/avatar_action.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index 2973149353e1c..f49ca084607cb 100644 --- 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() ) {