summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/teleport.h
diff options
context:
space:
mode:
authorPete Hurst <pete@streamuniverse.tv>2013-06-23 19:55:57 +0100
committerPete Hurst <pete@streamuniverse.tv>2013-06-23 21:04:22 +0100
commit1d7ac22ab8bd03bbedafc4f3fd31d74fcd184639 (patch)
tree6c33affd3eb481d69d72e25d197704b445815141 /crawl-ref/source/teleport.h
parentd56d9b1fecf14edf68f59ebc3e7149fd99a7af27 (diff)
downloadcrawl-ref-1d7ac22ab8bd03bbedafc4f3fd31d74fcd184639.tar.gz
crawl-ref-1d7ac22ab8bd03bbedafc4f3fd31d74fcd184639.zip
Handle jumping spider jumpiness slightly better
This solves a strange case where using disjunction on a jumping spider would still cause it to jump, and where a humanoid-jumping spider hybrid could read a blink scroll which would cause them to jump. The jump check is moved into its own function on the monster class.
Diffstat (limited to 'crawl-ref/source/teleport.h')
-rw-r--r--crawl-ref/source/teleport.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h
index d1c1320d39..3a8243e7fc 100644
--- a/crawl-ref/source/teleport.h
+++ b/crawl-ref/source/teleport.h
@@ -5,9 +5,8 @@ class actor;
class monster;
void blink_other_close(actor* victim, const coord_def& target);
-bool blink_away(monster* mon);
-bool blink_away(monster* mon, actor* caster, bool from_seen = true,
- bool jumping = false);
+bool blink_away(monster* mon, bool self_cast = false);
+bool blink_away(monster* mon, actor* caster, bool from_seen = true, bool self_cast = false);
void blink_range(monster* mon);
void blink_close(monster* mon);