change parameter of form_from_map to Character

CleverRaven · Oct 19, 2019 · d861a43 · d861a43
1 parent 3b79f53
commit d861a43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/inventory.cpp b/src/inventory.cpp
@@ -391,14 +391,14 @@ static int count_charges_in_list( const itype *type, const map_stack &items )
     return 0;
 }
 
-void inventory::form_from_map( const tripoint &origin, int range, const player *pl,
+void inventory::form_from_map( const tripoint &origin, int range, const Character *pl,
                                bool assign_invlet,
                                bool clear_path )
 {
     form_from_map( g->m, origin, range, pl, assign_invlet, clear_path );
 }
 
-void inventory::form_from_map( map &m, const tripoint &origin, int range, const player *pl,
+void inventory::form_from_map( map &m, const tripoint &origin, int range, const Character *pl,
                                bool assign_invlet,
                                bool clear_path )
 {

diff --git a/src/inventory.h b/src/inventory.h
@@ -125,10 +125,10 @@ class inventory : public visitable<inventory>
          * the player's worn items / weapon
          */
         void restack( player &p );
-        void form_from_map( const tripoint &origin, int range, const player *pl = nullptr,
+        void form_from_map( const tripoint &origin, int range, const Character *pl = nullptr,
                             bool assign_invlet = true,
                             bool clear_path = true );
-        void form_from_map( map &m, const tripoint &origin, int range, const player *pl = nullptr,
+        void form_from_map( map &m, const tripoint &origin, int range, const Character *pl = nullptr,
                             bool assign_invlet = true,
                             bool clear_path = true );
         /**