diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-01 21:14:06 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-01 21:14:06 +0000 |
| commit | 3d2b0998bdf89936687648f81c1ce68fc35080ef (patch) | |
| tree | ec12849647110addddb66c3c15bb24ee0768aa7a /crawl-ref/source/beam.cc | |
| parent | 313d4612b5af4371c00d24fa3559a7310c6f3849 (diff) | |
| download | crawl-ref-3d2b0998bdf89936687648f81c1ce68fc35080ef.tar.gz crawl-ref-3d2b0998bdf89936687648f81c1ce68fc35080ef.zip | |
Restored 0.2's character combinations, fixed crash when killing a monster using Pain.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2290 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, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index c4443068ff..7098bd3260 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3676,8 +3676,10 @@ static int affect_monster(bolt &beam, monsters *mon) // now do enchantment affect int ench_result = affect_monster_enchantment(beam, mon); - switch(ench_result) + if (mon->alive()) { + switch (ench_result) + { case MON_RESIST: if (simple_monster_message(mon, " resists.")) beam.msg_generated = true; @@ -3689,6 +3691,7 @@ static int affect_monster(bolt &beam, monsters *mon) default: update_hurt_or_helped(beam, mon); break; + } } return (rangeUsed); |