diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-29 20:43:46 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-29 20:43:46 +0000 |
| commit | 4c41626cef634afd8f6ded52eeb16903d72516fb (patch) | |
| tree | e9460de810199e0f4cc42c3d6abf2c36f4a610f8 /crawl-ref/source/delay.cc | |
| parent | 82fd8b10b5d975349ddb4088f205401687d75f7b (diff) | |
| download | crawl-ref-4c41626cef634afd8f6ded52eeb16903d72516fb.tar.gz crawl-ref-4c41626cef634afd8f6ded52eeb16903d72516fb.zip | |
Don't allow Recite to work on hasted monsters. This fixes a problem
where a failed Recite would haste a monster, and then continue, possibly
hasting it again, or even making it go berserk. (Just think of it as
reverse fleeing.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3489 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 0aff7a3d8d..330767d20f 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -53,7 +53,8 @@ static void handle_macro_delay(); static void finish_delay(const delay_queue_item &delay); // monster cannot be affected in these states -// (all results of Recite, plus friendly) +// (all results of Recite, plus friendly; +// note that berserk monsters are also hasted) static bool recite_mons_useless(const monsters *mon) { return (mons_intel(mon->type) < I_NORMAL @@ -63,7 +64,7 @@ static bool recite_mons_useless(const monsters *mon) || mons_neutral(mon) || mons_is_confused(mon) || mons_is_paralysed(mon) - || mon->has_ench(ENCH_BERSERK)); + || mon->has_ench(ENCH_HASTE)); } // power is maximum 50 |