summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-29 20:56:20 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-29 20:56:20 +0000
commit16acbf55b74d1d6c32cf34af8092a2df9756d65f (patch)
treefc908d303dc2d894411999efbafe77655a6f4ac9 /crawl-ref/source/monstuff.cc
parente66c77b50df3c0c91837b52b9e61c8235a96c685 (diff)
downloadcrawl-ref-16acbf55b74d1d6c32cf34af8092a2df9756d65f.tar.gz
crawl-ref-16acbf55b74d1d6c32cf34af8092a2df9756d65f.zip
* Replace rock stair tiles with Eino's cool new escape hatch tiles.
* Don't check milestones in arena mode. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10078 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index d0fee93312..c11167bd17 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1144,7 +1144,8 @@ int monster_die(monsters *monster, killer_type killer,
bool in_transit = false;
#ifdef DGL_MILESTONES
- _check_kill_milestone(monster, killer, killer_index);
+ if (!crawl_state.arena)
+ _check_kill_milestone(monster, killer, killer_index);
#endif
// Award experience for suicide if the suicide was caused by the
@@ -2706,7 +2707,9 @@ void behaviour_event(monsters *mon, mon_event_type event, int src,
// (Plain) plants and fungi cannot fight back.
if (mon->type == MONS_FUNGUS || mon->type == MONS_PLANT
|| mon->type == MONS_TOADSTOOL)
+ {
return;
+ }
mon->foe = src;