diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-05 15:22:45 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-05 15:22:45 +0000 |
| commit | 16af0422e54e97a9f6ca2f275ed51c19775b7b80 (patch) | |
| tree | f79a02b6c9c260028df0bd894511f965c51e0b01 /crawl-ref/source/monstuff.cc | |
| parent | 376d7d8be0443ac004a1fe5d88f56325497d1921 (diff) | |
| download | crawl-ref-16af0422e54e97a9f6ca2f275ed51c19775b7b80.tar.gz crawl-ref-16af0422e54e97a9f6ca2f275ed51c19775b7b80.zip | |
Travel will now avoid deep water unless you're permanently safe in it.
Failing to displace a monster triggers an interrupt.
Fixed up autoinscription a bit more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3004 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index a851a5e73d..750542c040 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1556,6 +1556,8 @@ bool swap_places(monsters *monster) // Might not be ideal, but it's better that insta-killing // the monster... maybe try for a short blinki instead? -- bwr simple_monster_message( monster, " resists." ); + // FIXME: AI_HIT_MONSTER isn't ideal. + interrupt_activity( AI_HIT_MONSTER, monster ); } return (swap); |