Fix grabded furniture/vehicle destruction feature and tests for same

CleverRaven · Feb 6, 2021 · 5c936e6 · 5c936e6
1 parent 0fceedc
commit 5c936e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/map.cpp b/src/map.cpp
@@ -1357,7 +1357,7 @@ void map::furn_set( const tripoint &p, const furn_id &new_furniture )
     avatar &player_character = get_avatar();
     // If player has grabbed this furniture and it's no longer grabbable, release the grab.
     if( player_character.get_grab_type() == object_type::FURNITURE &&
-        player_character.grab_point == p && !new_t.is_movable() ) {
+        player_character.pos() + player_character.grab_point == p && !new_t.is_movable() ) {
         add_msg( _( "The %s you were grabbing is destroyed!" ), old_t.name() );
         player_character.grab( object_type::NONE );
     }

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
@@ -167,7 +167,7 @@ class DefaultRemovePartHandler : public RemovePartHandler
             // TODO: maybe do this for all the nearby NPCs as well?
 
             if( player_character.get_grab_type() == object_type::VEHICLE &&
-                player_character.grab_point == veh.global_part_pos3( part ) ) {
+                player_character.pos() + player_character.grab_point == veh.global_part_pos3( part ) ) {
                 if( veh.parts_at_relative( veh.part( part ).mount, false ).empty() ) {
                     add_msg( m_info, _( "The vehicle part you were holding has been destroyed!" ) );
                     player_character.grab( object_type::NONE );

diff --git a/tests/map_test.cpp b/tests/map_test.cpp
@@ -23,7 +23,8 @@ TEST_CASE( "destroy_grabbed_furniture" )
         player_character.setpos( test_origin );
         const tripoint grab_point = test_origin + tripoint_east;
         here.furn_set( grab_point, furn_id( "f_chair" ) );
-        player_character.grab( object_type::FURNITURE, grab_point );
+        player_character.grab( object_type::FURNITURE, tripoint_east );
+        REQUIRE( player_character.get_grab_type() == object_type::FURNITURE );
         WHEN( "The furniture grabbed by the player is destroyed" ) {
             here.destroy( grab_point );
             THEN( "The player's grab is released" ) {

diff --git a/tests/vehicle_test.cpp b/tests/vehicle_test.cpp
@@ -41,9 +41,9 @@ TEST_CASE( "destroy_grabbed_vehicle_section" )
                                              0, 0 );
         REQUIRE( veh_ptr != nullptr );
         tripoint grab_point = test_origin + tripoint_east;
-        player_character.grab( object_type::VEHICLE, grab_point );
-        REQUIRE( player_character.get_grab_type() != object_type::NONE );
-        REQUIRE( player_character.grab_point == grab_point );
+        player_character.grab( object_type::VEHICLE, tripoint_east );
+        REQUIRE( player_character.get_grab_type() == object_type::VEHICLE );
+        REQUIRE( player_character.grab_point == tripoint_east );
         WHEN( "The vehicle section grabbed by the player is destroyed" ) {
             here.destroy( grab_point );
             REQUIRE( veh_ptr->get_parts_at( grab_point, "", part_status_flag::available ).empty() );