Merge pull request #82485 from sparr/dedupe_iuse_actor_map_lookup

Dedupe iuse_actor overloads

Author: Maleclypse

src/item_action.cpp

@@ -30,6 +30,7 @@
 #include "item_pocket.h"
 #include "itype.h"
 #include "iuse.h"
+#include "map.h"
 #include "output.h"
 #include "pimpl.h"
 #include "pocket_type.h"
@@ -40,8 +41,6 @@
 #include "uilist.h"
 #include "visitable.h"
 
-class map;
-
 static const std::string errstring( "ERROR" );
 
 static const flag_id json_flag_IRREMOVABLE( "IRREMOVABLE" );
@@ -394,9 +393,15 @@ std::string use_function::get_type() const
     }
 }
 
-ret_val<void> iuse_actor::can_use( const Character &, const item &, const tripoint_bub_ms & ) const
+std::optional<int> iuse_actor::use( Character *p, item &it, const tripoint_bub_ms &pos ) const
 {
-    return ret_val<void>::make_success();
+    return use( p, it, &get_map(), pos );
+}
+
+ret_val<void> iuse_actor::can_use( const Character &p, const item &it,
+                                   const tripoint_bub_ms &pos ) const
+{
+    return can_use( p, it, &get_map(), pos );
 }
 
 ret_val<void> iuse_actor::can_use( const Character &, const item &, map *,

src/iuse.h

@@ -293,7 +293,7 @@ class iuse_actor
         virtual ~iuse_actor() = default;
         virtual void load( const JsonObject &jo, const std::string &src ) = 0;
         // TODO: Replace usage of map unaware overload with map aware.
-        virtual std::optional<int> use( Character *, item &, const tripoint_bub_ms & ) const = 0;
+        virtual std::optional<int> use( Character *, item &, const tripoint_bub_ms & ) const;
         virtual std::optional<int> use( Character *, item &, map *here, const tripoint_bub_ms & ) const = 0;
         // TODO: Replace usage of map unaware overload with map aware.
         virtual ret_val<void> can_use( const Character &, const item &, const tripoint_bub_ms & ) const;