From d861a432b1c2f041ae9884e1be9ff44f5704cc30 Mon Sep 17 00:00:00 2001 From: KorGgenT Date: Fri, 18 Oct 2019 21:38:14 -0400 Subject: [PATCH] change parameter of form_from_map to Character --- src/inventory.cpp | 4 ++-- src/inventory.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/inventory.cpp b/src/inventory.cpp index e3c6ea776ae03..441ab9eed1570 100644 --- 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 index 747070b49a941..308a40a3ab452 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -125,10 +125,10 @@ class inventory : public visitable * 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 ); /**