diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-13 14:18:22 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-13 14:18:22 +0000 |
commit | 59ed12959885ad6abb1b8c3cbe31e66e74417136 (patch) | |
tree | af18e8db3b3d9fa6108752d05566a6b6c6928471 /crawl-ref/source/items.h | |
parent | 8d97ef9f448666629bb9338f3641ee5404ecee66 (diff) | |
download | crawl-ref-59ed12959885ad6abb1b8c3cbe31e66e74417136.tar.gz crawl-ref-59ed12959885ad6abb1b8c3cbe31e66e74417136.zip |
Fix spurious encumberance messages when combining ammo in inventory.
Fixes 2354891.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7823 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.h')
-rw-r--r-- | crawl-ref/source/items.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h index ecf947786b..959f2efd0a 100644 --- a/crawl-ref/source/items.h +++ b/crawl-ref/source/items.h @@ -32,11 +32,11 @@ enum item_source_type bool is_valid_item( const item_def &item ); -bool dec_inv_item_quantity( int obj, int amount ); -bool dec_mitm_item_quantity( int obj, int amount ); +bool dec_inv_item_quantity(int obj, int amount, bool suppress_burden = false); +bool dec_mitm_item_quantity(int obj, int amount); -void inc_inv_item_quantity( int obj, int amount ); -void inc_mitm_item_quantity( int obj, int amount ); +void inc_inv_item_quantity(int obj, int amount, bool suppress_burden = false); +void inc_mitm_item_quantity(int obj, int amount); bool move_item_to_grid( int *const obj, const coord_def& p ); void move_item_stack_to_grid( const coord_def& from, const coord_def& to ); |