diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-20 15:04:11 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-20 15:04:11 +0000 |
| commit | c0fe02b91def8782f6f4d2cb054c05228880432a (patch) | |
| tree | 7a138ad3cdfa97dbbc12a929fc59fe41eb7a62b6 /crawl-ref/source/items.cc | |
| parent | 66cd85ea1d4dea648a94821e4fc3c7030c991be7 (diff) | |
| download | crawl-ref-c0fe02b91def8782f6f4d2cb054c05228880432a.tar.gz crawl-ref-c0fe02b91def8782f6f4d2cb054c05228880432a.zip | |
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
Diffstat (limited to 'crawl-ref/source/items.cc')
| -rw-r--r-- | crawl-ref/source/items.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |