From c0fe02b91def8782f6f4d2cb054c05228880432a Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 20 Sep 2008 15:04:11 +0000 Subject: Fix 2111406, 2058865: stacking interacting badly with allies. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6957 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/items.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index df5ad56637..5dd451e4e2 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1288,7 +1288,7 @@ bool items_similar(const item_def &item1, const item_def &item2) #define NON_IDENT_FLAGS ~(ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK | \ ISFLAG_DROPPED | ISFLAG_THROWN | \ ISFLAG_NOTED_ID | ISFLAG_NOTED_GET | \ - ISFLAG_BEEN_IN_INV) + ISFLAG_BEEN_IN_INV | ISFLAG_DROPPED_BY_ALLY) if ((item1.flags & NON_IDENT_FLAGS) != (item2.flags & NON_IDENT_FLAGS)) return (false); -- cgit v1.2.3-54-g00ecf