diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-13 20:40:08 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-13 20:40:08 -0700 |
| commit | 64ebc5910fabcb5ad9e9b1813df24c2ff9cb71c6 (patch) | |
| tree | 9f0a0e6f2e9b8153ba2f6b7fac5bbd6485009c2d /crawl-ref/source/traps.h | |
| parent | d68dae0310a964cbd288c926be2c870d753994b0 (diff) | |
| download | crawl-ref-64ebc5910fabcb5ad9e9b1813df24c2ff9cb71c6.tar.gz crawl-ref-64ebc5910fabcb5ad9e9b1813df24c2ff9cb71c6.zip | |
Tidy up some web/net behaviour
Monsters should now try to escape from Arachne's
ensnare immediately (on whatever incredibly rare
occasions that is relevant), and shouldn't try to
break out of net traps on the turn they get netted.
This technically breaks save compat with the old
newly_webbed prop, but in a harmless way.
Diffstat (limited to 'crawl-ref/source/traps.h')
| -rw-r--r-- | crawl-ref/source/traps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/traps.h b/crawl-ref/source/traps.h index 7ece025a13..f218a8f7d9 100644 --- a/crawl-ref/source/traps.h +++ b/crawl-ref/source/traps.h @@ -9,7 +9,7 @@ #include "enum.h" #include "externs.h" -#define NEW_WEB_KEY "freshly_webbed" +#define NEWLY_TRAPPED_KEY "newly_trapped" struct bolt; class monster; @@ -21,7 +21,7 @@ void free_stationary_net(int item_index); void handle_traps(trap_type trt, int i, bool trap_known); int get_trapping_net(const coord_def& where, bool trapped = true); -void monster_caught_in_net(monster* mon, actor *agent); +bool monster_caught_in_net(monster* mon, actor *agent); bool player_caught_in_net(); void clear_trapping_net(); void check_net_will_hold_monster(monster* mon); |