diff options
author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-04 17:24:47 -0700 |
---|---|---|
committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-04 17:24:47 -0700 |
commit | b98b8932dcd445179cf0c0d235e91f6d1e577f92 (patch) | |
tree | 7e575ed8c1165244f653ebfc3545818634728403 /crawl-ref/source/items.h | |
parent | 018e8dee5c24d5aa14632fe9dad5295a7ee9c7f4 (diff) | |
download | crawl-ref-b98b8932dcd445179cf0c0d235e91f6d1e577f92.tar.gz crawl-ref-b98b8932dcd445179cf0c0d235e91f6d1e577f92.zip |
Refactor item pickup code
Diffstat (limited to 'crawl-ref/source/items.h')
-rw-r--r-- | crawl-ref/source/items.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h index b626d060ae..ab58927adf 100644 --- a/crawl-ref/source/items.h +++ b/crawl-ref/source/items.h @@ -41,7 +41,9 @@ bool move_item_to_grid(int *const obj, const coord_def& p, bool silent = false); void move_item_stack_to_grid(const coord_def& from, const coord_def& to); void note_inscribe_item(item_def &item); -int move_item_to_player(int obj, int quant_got, bool quiet = false); +bool move_item_to_inv(int obj, int quant_got, bool quiet = false); +bool merge_items_into_inv(item_def &it, int quant_got, int &inv_slot, + bool quiet = false); void mark_items_non_pickup_at(const coord_def &pos); void mark_items_non_visit_at(const coord_def &pos); void clear_item_pickup_flags(item_def &item); |