summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-08-23 14:54:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-08-23 14:54:37 +0000
commit72acf198cb29df6fc60463fc042356f549f10b43 (patch)
tree086626160bb32c3d67cbd0fd4fa006bd79bc01b2
parent73f8eb9c4129f4258a18be767bad0506cb1ba000 (diff)
downloadcrawl-ref-72acf198cb29df6fc60463fc042356f549f10b43.tar.gz
crawl-ref-72acf198cb29df6fc60463fc042356f549f10b43.zip
Fixed a crash. My bad.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2029 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/fight.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 078b55d871..202bb9146c 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2627,7 +2627,7 @@ bool melee_attack::mons_attack_mons()
{
mons_perform_attack();
if (perceived_attack && (def->foe == MHITNOT || one_chance_in(3))
- && atk->alive())
+ && atk->alive() && def->alive())
{
behaviour_event(def, ME_WHACK, monster_index(atk));
}