summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/teleport.h
diff options
context:
space:
mode:
authorPete Hurst <pete@streamuniverse.tv>2013-05-26 21:27:13 +0100
committerPete Hurst <pete@streamuniverse.tv>2013-05-26 21:30:06 +0100
commitaebbbe95ad6138e3f8b7af5a292538c475171f7f (patch)
tree353c853a82e2584b52b8b534e4bcaafb24018d9a /crawl-ref/source/teleport.h
parentec3c20f3bb3e4367c4ef844b2e1da9160a1d0e76 (diff)
downloadcrawl-ref-aebbbe95ad6138e3f8b7af5a292538c475171f7f.tar.gz
crawl-ref-aebbbe95ad6138e3f8b7af5a292538c475171f7f.zip
Make jumping spiders jump instead of blink
- Because they blinked they could go through grates (Mantis #5590) which didn't make sense for physical movement - Verb was wrong and purple clouds appeared despite some special- casing to prevent this; because crawl_state.which_mon_acting() actually returns an inaccurately null value during monster spellcasting and some other contexts. That function is only designed for use in handling "comes into view" messages properly and needs fixing to be fit for any general purpose. - "Appears out of nowhere" message was inaccurate, this would only have been seen rarely, but "leaps into view" is better
Diffstat (limited to 'crawl-ref/source/teleport.h')
-rw-r--r--crawl-ref/source/teleport.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h
index b0f4500285..e0bb9062af 100644
--- a/crawl-ref/source/teleport.h
+++ b/crawl-ref/source/teleport.h
@@ -4,9 +4,16 @@
class actor;
class monster;
+enum blink_type
+{
+ BLINK_TLOC,
+ BLINK_LEAP
+};
+
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 blink_away(monster* mon, actor* caster, bool from_seen = true,
+ bool jumping = false);
void blink_range(monster* mon);
void blink_close(monster* mon);