diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:51:31 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:56:36 +0200 |
| commit | 2c8c99fec4aab48970d75030ece87dda40260e78 (patch) | |
| tree | ed687319685e936cb25b8fa046c01209c36c7525 /crawl-ref/source/traps.h | |
| parent | 01c2aa8463804cdd4ff8818b78c1deb890a78efb (diff) | |
| parent | 537a8dfbb6582c8269e3239b63a5d2ea03eb77a3 (diff) | |
| download | crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.tar.gz crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.zip | |
Merge branch 'master' into portal_branches
This includes fixes for 64834896234968 places in master that add new uses of
LEVEL_FOO and so on.
Diffstat (limited to 'crawl-ref/source/traps.h')
| -rw-r--r-- | crawl-ref/source/traps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/traps.h b/crawl-ref/source/traps.h index 7e62128cc6..d413ae3865 100644 --- a/crawl-ref/source/traps.h +++ b/crawl-ref/source/traps.h @@ -46,4 +46,5 @@ trap_type random_trap_for_place(const level_id &place = level_id::current()); int count_traps(trap_type ttyp); void place_webs(int num, bool is_second_phase = false); bool maybe_destroy_web(actor *oaf); +bool ensnare(actor *fly); #endif |