summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/items.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/items.cc')
-rw-r--r--crawl-ref/source/items.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index ddcb527f8e..d4807bbd0f 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1332,10 +1332,11 @@ bool items_stack( const item_def &item1, const item_def &item2,
return false;
// Check the non-ID flags, but ignore dropped, thrown, cosmetic,
- // and note flags
+ // and note flags. Also, whether item was in inventory before.
#define NON_IDENT_FLAGS ~(ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK | \
ISFLAG_DROPPED | ISFLAG_THROWN | \
- ISFLAG_NOTED_ID | ISFLAG_NOTED_GET)
+ ISFLAG_NOTED_ID | ISFLAG_NOTED_GET | \
+ ISFLAG_BEEN_IN_INV)
if ((item1.flags & NON_IDENT_FLAGS) !=
(item2.flags & NON_IDENT_FLAGS))
{