diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-27 22:26:04 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-27 22:26:04 +0000 |
| commit | c9a8094eec1acb94149980937c60d8c05f8d901b (patch) | |
| tree | f2d30df23182bddd1b53196161a219d9733fb897 | |
| parent | b21664dc870f0fdd30212ec46cba0dd59d4c60a9 (diff) | |
| download | crawl-ref-c9a8094eec1acb94149980937c60d8c05f8d901b.tar.gz crawl-ref-c9a8094eec1acb94149980937c60d8c05f8d901b.zip | |
Monster arrows no longer get dropped on destroyer grids (1744345.)
Fixed a crash when monsters 'splash around'.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1673 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/beam.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 3bd13ae45d..cd972897b5 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2369,15 +2369,15 @@ void beam_drop_object( bolt &beam, item_def *item, int x, int y ) if (beam.is_tracer || beam.flavour != BEAM_MISSILE) return; - // maybe we can remove the YOU_KILL... - if ( grid_destroys_items(grd[x][y]) && YOU_KILL(beam.thrower) ) + if ( grid_destroys_items(grd[x][y]) ) { - mprf(MSGCH_SOUND, grid_item_destruction_message(grd[x][y])); + // Too much message spam otherwise + if ( YOU_KILL(beam.thrower) ) + mprf(MSGCH_SOUND, grid_item_destruction_message(grd[x][y])); return; } - if (YOU_KILL(beam.thrower) // ie if you threw it. - && (!grid_destroys_items(grd[x][y]))) + if (YOU_KILL(beam.thrower)) // you threw it { int chance; diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 0eb69db713..1f9fe7951b 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2375,7 +2375,8 @@ bool monsters::fumbles_attack(bool verbose) const bool can_see = mons_near(this) && player_monster_visible(this); if (can_see) - mprf("%s splashes around in the water."); + mprf("%s splashes around in the water.", + this->name(DESC_CAP_THE).c_str()); else if (!silenced(you.x_pos, you.y_pos) && !silenced(x, y)) mprf(MSGCH_SOUND, "You hear a splashing noise."); } |