diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-09-21 06:38:27 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-09-22 00:30:08 +0200 |
| commit | 7b201d5282c519ad953f4653d393c70dc7e0d5be (patch) | |
| tree | f543e16a52ee56aa302817eed86860fbe2516d2a /crawl-ref/source/items.h | |
| parent | fabd5e008e9fe9e8d56a265cf5caff2cbca2c051 (diff) | |
| download | crawl-ref-7b201d5282c519ad953f4653d393c70dc7e0d5be.tar.gz crawl-ref-7b201d5282c519ad953f4653d393c70dc7e0d5be.zip | |
Purge a small part of monster thrown weapon AI.
Diffstat (limited to 'crawl-ref/source/items.h')
| -rw-r--r-- | crawl-ref/source/items.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h index 4e0c5b07cc..8becc145cb 100644 --- a/crawl-ref/source/items.h +++ b/crawl-ref/source/items.h @@ -47,8 +47,7 @@ void mark_items_non_visit_at(const coord_def &pos); void clear_item_pickup_flags(item_def &item); 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_merge = false); +bool items_stack(const item_def &item1, const item_def &item2); void merge_item_stacks(item_def &source, item_def &dest, int quant = -1); |