diff --git a/src/map.cpp b/src/map.cpp index aaf72b22f371a..b7a7838874372 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -6252,20 +6252,6 @@ std::list map::items_with( const tripoint_bub_ms &p, return ret; } -std::list map::use_amount( const std::vector &reachable_pts, const itype_id &type, - int &quantity, const std::function &filter, bool select_ind ) -{ - std::vector temp; - temp.reserve( reachable_pts.size() ); - - for( const tripoint p : reachable_pts ) { - const tripoint_bub_ms pt( p ); - temp.emplace_back( pt ); - } - - return map::use_amount( temp, type, quantity, filter, select_ind ); -} - std::list map::use_amount( const std::vector &reachable_pts, const itype_id &type, int &quantity, const std::function &filter, bool select_ind ) @@ -6374,22 +6360,6 @@ static void use_charges_from_furn( const furn_t &f, const itype_id &type, int &q } } -std::list map::use_charges( const std::vector &reachable_pts, - const itype_id &type, int &quantity, - const std::function &filter, - basecamp *bcp, bool in_tools ) -{ - std::vector temp; - temp.reserve( reachable_pts.size() ); - - for( tripoint p : reachable_pts ) { - const tripoint_bub_ms pt( p ); - temp.emplace_back( pt ); - } - - return map::use_charges( temp, type, quantity, filter, bcp, in_tools ); -} - std::list map::use_charges( const std::vector &reachable_pts, const itype_id &type, int &quantity, const std::function &filter, @@ -6446,14 +6416,6 @@ std::list map::use_charges( const std::vector &reachable_ return ret; } -std::list map::use_charges( const tripoint &origin, const int range, - const itype_id &type, int &quantity, - const std::function &filter, - basecamp *bcp, bool in_tools ) -{ - return map::use_charges( tripoint_bub_ms( origin ), range, type, quantity, filter, bcp, in_tools ); -} - std::list map::use_charges( const tripoint_bub_ms &origin, const int range, const itype_id &type, int &quantity, const std::function &filter, @@ -6464,19 +6426,6 @@ std::list map::use_charges( const tripoint_bub_ms &origin, const int range return use_charges( reachable_pts, type, quantity, filter, bcp, in_tools ); } -units::energy map::consume_ups( const std::vector &reachable_pts, units::energy qty ) -{ - std::vector temp; - temp.reserve( reachable_pts.size() ); - - for( const tripoint p : reachable_pts ) { - const tripoint_bub_ms pt( p ); - temp.emplace_back( pt ); - } - - return map::consume_ups( temp, qty ); -} - units::energy map::consume_ups( const std::vector &reachable_pts, units::energy qty ) { diff --git a/src/map.h b/src/map.h index 1b6c88a792cf6..e48ed915739f8 100644 --- a/src/map.h +++ b/src/map.h @@ -1567,25 +1567,12 @@ class map std::list use_amount( const tripoint_bub_ms &origin, int range, const itype_id &type, int &quantity, const std::function &filter = return_true, bool select_ind = false ); - // TODO: Get rid of untyped overload. - std::list use_amount( const std::vector &reachable_pts, const itype_id &type, - int &quantity, - const std::function &filter = return_true, bool select_ind = false ); std::list use_amount( const std::vector &reachable_pts, const itype_id &type, int &quantity, const std::function &filter = return_true, bool select_ind = false ); - // TODO: Get rid of untyped overload. - std::list use_charges( const tripoint &origin, int range, const itype_id &type, - int &quantity, const std::function &filter = return_true, - basecamp *bcp = nullptr, bool in_tools = false ); std::list use_charges( const tripoint_bub_ms &origin, int range, const itype_id &type, int &quantity, const std::function &filter = return_true, basecamp *bcp = nullptr, bool in_tools = false ); - // TODO: Get rid of untyped overload. - std::list use_charges( const std::vector &reachable_pts, const itype_id &type, - int &quantity, - const std::function &filter = return_true, - basecamp *bcp = nullptr, bool in_tools = false ); std::list use_charges( const std::vector &reachable_pts, const itype_id &type, int &quantity, @@ -1593,7 +1580,7 @@ class map basecamp *bcp = nullptr, bool in_tools = false ); /** Find items located at point p (on map or in vehicles) that pass the filter */ - // TODO: Get rid of untyped overload. + // TODO: Get rid of untyped overload, should be removable once #78677 merges. std::list items_with( const tripoint &p, const std::function &filter ); std::list items_with( const tripoint_bub_ms &p, @@ -1606,8 +1593,6 @@ class map * @param qty amount of energy to consume. Is rounded down to kJ precision. Do not use negative values. * @return Actual amount of energy consumed */ - // TODO: Get rid of untyped overload. - units::energy consume_ups( const std::vector &reachable_pts, units::energy qty ); units::energy consume_ups( const std::vector &reachable_pts, units::energy qty ); units::energy consume_ups( const tripoint_bub_ms &origin, int range, units::energy qty );