diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-23 22:19:01 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-23 22:19:01 +0000 |
| commit | 2b26e96225ab27c37e0a7efaea30a2a2eb0fe34f (patch) | |
| tree | 9ed43722f1b812deb674bea876bee8d9759e6564 /crawl-ref/source/items.cc | |
| parent | 1b6a9218017b078613a735323eed1c334a06c793 (diff) | |
| download | crawl-ref-2b26e96225ab27c37e0a7efaea30a2a2eb0fe34f.tar.gz crawl-ref-2b26e96225ab27c37e0a7efaea30a2a2eb0fe34f.zip | |
Adding Vampire aptitudes to tables.txt (Bug 1816344).
Also changed Ranged Combat to Throwing, while I was at it.
Fixing 1817775: portaled projectile treats returning weapons like
any other projectile (no duplicates any more, but also no returning).
I think this makes sense, seeing how the spell teleports it somewhere
so how should it know the path back.
Fixing 1817995: starting items not stacking correctly.
Question: Why is the flag BEEN_IN_INV even set for starting inventory?
Applying two patches by dolorous:
1818736: comment fix for MUT_SAPROVOROUS
1818667: remove redundant MUT_HOOVES check
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2526 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
| -rw-r--r-- | crawl-ref/source/items.cc | 5 |
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)) { |