diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-29 14:14:04 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-29 14:14:04 +0000 |
| commit | f90424b8c2cb4d62ef5e34062cc6903918ecd37f (patch) | |
| tree | 85a1868739f8ad9bb222cf527f823181af9e3153 /crawl-ref/source/items.h | |
| parent | a2f0ab5525c06209f40a011bc7080c8b7d69b5e3 (diff) | |
| download | crawl-ref-f90424b8c2cb4d62ef5e34062cc6903918ecd37f.tar.gz crawl-ref-f90424b8c2cb4d62ef5e34062cc6903918ecd37f.zip | |
Force quiver to attempt to use the exact same item in inventory (slot
and all, if it still exists) before accepting any item that happens to
have the same properties (base + subtype, plusses etc.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6220 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.h')
| -rw-r--r-- | crawl-ref/source/items.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h index 1be9387d4d..bdccd3bc43 100644 --- a/crawl-ref/source/items.h +++ b/crawl-ref/source/items.h @@ -42,8 +42,9 @@ void move_item_stack_to_grid( int x, int y, int targ_x, int targ_y ); int move_item_to_player( int obj, int quant_got, bool quiet = false ); void mark_items_non_pickup_at(const coord_def &pos); bool is_stackable_item( const item_def &item ); +bool items_similar( const item_def &item1, const item_def &item2 ); bool items_stack( const item_def &item1, const item_def &item2, - bool force = false ); + bool force_merge = false ); item_def find_item_type(object_class_type base_type, std::string name); item_def *find_floor_item(object_class_type cls, int sub_type); |