diff options
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 4f01f1145a..40a19123cb 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -659,11 +659,8 @@ static void _xom_make_item(object_class_type base, int subtype, int power) items(true, base, subtype, true, power, MAKE_ITEM_RANDOM_RACE, 0, 0, GOD_XOM); - if (feat_destroys_items(grd(you.pos()))) + if (feat_destroys_item(grd(you.pos()), mitm[thing_created], !silenced(you.pos()))) { - if (!silenced(you.pos())) - mprf(MSGCH_SOUND, feat_item_destruction_message(grd(you.pos()))); - simple_god_message(" snickers.", GOD_XOM); destroy_item(thing_created, true); thing_created = NON_ITEM; @@ -682,9 +679,9 @@ static void _xom_make_item(object_class_type base, int subtype, int power) mitm[thing_created].name(DESC_PLAIN).c_str()); take_note(Note(NOTE_XOM_EFFECT, you.piety, -1, gift_buf), true); - move_item_to_grid(&thing_created, you.pos()); mitm[thing_created].inscription = "god gift"; canned_msg(MSG_SOMETHING_APPEARS); + move_item_to_grid(&thing_created, you.pos()); stop_running(); } @@ -2425,7 +2422,7 @@ static void _xom_zero_miscast() } } - if (!feat_destroys_items(feat) && !feat_is_solid(feat) + if (feat_has_solid_floor(feat) && inv_items.size() > 0) { int idx = inv_items[random2(inv_items.size())]; |