diff options
| author | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
| commit | 2057b86a740fdaf7c9879ee9c9bd7dd296685c73 (patch) | |
| tree | c1d9b88b860230dce07aa81a1ecd3a0b6c5917a1 /crawl-ref/source/delay.cc | |
| parent | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (diff) | |
| parent | e7b95c8c9b3bd68a43ba0da89221226cd41dcc80 (diff) | |
| download | crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.tar.gz crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/source/dat/des/variable/mini_monsters.des
crawl-ref/source/enum.h
crawl-ref/source/itemprop.cc
crawl-ref/source/main.cc
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/newgame.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/rltiles/dc-player.txt
crawl-ref/source/spl-selfench.cc
crawl-ref/source/throw.cc
crawl-ref/source/tilepick-p.cc
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 18e11b837a..bf72db24bb 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1254,7 +1254,7 @@ static void _armour_wear_effects(const int item_slot) item_def &arm = you.inv[item_slot]; - set_ident_flags(arm, ISFLAG_EQ_ARMOUR_MASK); + set_ident_flags(arm, ISFLAG_IDENT_MASK); if (is_artefact(arm)) arm.flags |= ISFLAG_NOTED_ID; |