diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-07 01:32:31 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-07 02:15:58 -0400 |
| commit | cdf1dfce163e53efcafa8efde3c3620d1b73208d (patch) | |
| tree | 01844b03aedad830053b6841821c7898f37082b6 /crawl-ref/source/stash.cc | |
| parent | 1753d8fc5c15c09e6891a800348246b3ba0542d9 (diff) | |
| download | crawl-ref-cdf1dfce163e53efcafa8efde3c3620d1b73208d.tar.gz crawl-ref-cdf1dfce163e53efcafa8efde3c3620d1b73208d.zip | |
Ignore rod charge in stash comparisons (#8652)
Diffstat (limited to 'crawl-ref/source/stash.cc')
| -rw-r--r-- | crawl-ref/source/stash.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 6e2111063b..210c897b36 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -187,8 +187,10 @@ bool Stash::are_items_same(const item_def &a, const item_def &b) { const bool same = a.base_type == b.base_type && a.sub_type == b.sub_type - && (a.plus == b.plus || a.base_type == OBJ_GOLD) - && a.plus2 == b.plus2 + // Ignore Gozag's gold flag, and rod charges. + && (a.plus == b.plus || a.base_type == OBJ_GOLD + || a.base_type == OBJ_RODS) + && (a.plus2 == b.plus2 || a.base_type == OBJ_RODS) && a.special == b.special && a.colour == b.colour && a.flags == b.flags |