diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-25 17:04:20 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-25 17:04:20 +0000 |
commit | 0136740f19467e681f934718d109748458fa49c6 (patch) | |
tree | e66dc038fbeb502c6ebc88a27cdbb5a249756147 /crawl-ref/source/beam.cc | |
parent | f2a94f71c96d1c838df9d509d75dae2398c0a875 (diff) | |
download | crawl-ref-0136740f19467e681f934718d109748458fa49c6.tar.gz crawl-ref-0136740f19467e681f934718d109748458fa49c6.zip |
[1823627] Fixed message spam for monsters using enchantments out of LOS.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3336 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 57eff0c0c3..9fc297f3d3 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1566,11 +1566,15 @@ void fire_beam( bolt &pbolt, item_def *item, bool drop_item ) pbolt.target_y = oy; } - // canned msg for enchantments that affected no-one + // canned msg for enchantments that affected no-one, but only if the + // enchantment is yours. if (pbolt.name[0] == '0' && pbolt.flavour != BEAM_DIGGING) { - if (!pbolt.is_tracer && !pbolt.msg_generated && !pbolt.obvious_effect) + if (!pbolt.is_tracer && !pbolt.msg_generated && !pbolt.obvious_effect + && YOU_KILL(pbolt.thrower)) + { canned_msg(MSG_NOTHING_HAPPENS); + } } if (!pbolt.is_tracer && pbolt.beam_source != NON_MONSTER) @@ -1586,7 +1590,7 @@ void fire_beam( bolt &pbolt, item_def *item, bool drop_item ) if (!pbolt.is_tracer) set_buffering(oldValue); #endif -} // end fire_beam(); +} // returns damage taken by a monster from a "flavoured" (fire, ice, etc.) |