diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-03 18:16:32 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-03 18:16:32 +0000 |
| commit | 4784853d9f621bfdd83d72fec2641c138d5ac96f (patch) | |
| tree | f33c756458e246855bdfbe76fb131782640706fa /crawl-ref/source/beam.cc | |
| parent | 7a242f8e4ab1ab615cadcbf280de0ddd99754b0a (diff) | |
| download | crawl-ref-4784853d9f621bfdd83d72fec2641c138d5ac96f.tar.gz crawl-ref-4784853d9f621bfdd83d72fec2641c138d5ac96f.zip | |
Add miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5458 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 99912bc9e1..a0f9f129f5 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3454,7 +3454,7 @@ static void _affect_place_explosion_clouds(bolt &beam, int x, int y) static int _beam_ouch_agent(const bolt &beam) { - return YOU_KILL(beam.thrower)? 0 : beam.beam_source; + return YOU_KILL(beam.thrower) ? 0 : beam.beam_source; } // A little helper function to handle the calling of ouch()... @@ -3689,7 +3689,8 @@ static int _affect_player( bolt &beam, item_def *item ) && you_resist_magic( beam.ench_power )) { bool need_msg = true; - if (beam.thrower != KILL_YOU_MISSILE && beam.beam_source != -1) + if (beam.thrower != KILL_YOU_MISSILE + && !invalid_monster_index(beam.beam_source)) { monsters *mon = &menv[beam.beam_source]; if (!player_monster_visible(mon)) |