diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-14 01:00:49 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-14 01:00:49 +0100 |
| commit | 9052b543871710fec37458839946f7f17689296b (patch) | |
| tree | 0840a95218b0819fc4ec674622a9be650289ef7b | |
| parent | a69acd1169503d390eff043b8e4f7c1b2c7480ae (diff) | |
| download | crawl-ref-9052b543871710fec37458839946f7f17689296b.tar.gz crawl-ref-9052b543871710fec37458839946f7f17689296b.zip | |
Fix equip funcs of artefact armour and jewelry being called with no show_msgs.
| -rw-r--r-- | crawl-ref/source/art-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/delay.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/art-data.h b/crawl-ref/source/art-data.h index 18e7f5c132..c6170f1e74 100644 --- a/crawl-ref/source/art-data.h +++ b/crawl-ref/source/art-data.h @@ -1540,7 +1540,7 @@ "A robe of a material so flimsy it could almost be clouds.", "", "", - NULL, NULL, _RCLOUDS_world_reacts, { NULL }, NULL, + _RCLOUDS_equip, NULL, _RCLOUDS_world_reacts, { NULL }, NULL, }, /* UNRAND_DUMMY2 */ diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 2fa9fda6a3..5af0f6aa4c 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1560,7 +1560,10 @@ void armour_wear_effects(const int item_slot) } if (is_artefact(arm)) - use_artefact(arm, NULL, melded); + { + bool show_msgs = true; + use_artefact(arm, &show_msgs, melded); + } if (item_cursed(arm) && !melded) { diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index abb21d0fc2..e10141dad6 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3454,7 +3454,8 @@ void jewellery_wear_effects(item_def &item) // so we don't allow them to make the base types known. if (artefact) { - use_artefact(item); + bool show_msgs = true; + use_artefact(item, &show_msgs); if (learn_pluses && (item.plus != 0 || item.plus2 != 0)) set_ident_flags(item, ISFLAG_KNOW_PLUSES); |