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/dungeon.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/dungeon.h')
| -rw-r--r-- | crawl-ref/source/dungeon.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h index f9af23f66f..b35da56dcb 100644 --- a/crawl-ref/source/dungeon.h +++ b/crawl-ref/source/dungeon.h @@ -232,8 +232,8 @@ void level_welcome_messages(); void run_map_epilogues (); struct trap_spec; -bool place_specific_trap(const coord_def& where, trap_type trap_spec); -bool place_specific_trap(const coord_def& where, trap_spec* spec); +bool place_specific_trap(const coord_def& where, trap_type trap_spec, int charges = 0); +bool place_specific_trap(const coord_def& where, trap_spec* spec, int charges = 0); struct shop_spec; void place_spec_shop(const coord_def& where, @@ -306,8 +306,6 @@ inline int count_neighbours(const coord_def& p, dungeon_feature_type feat) return count_neighbours(p.x, p.y, feat); } -void remember_vault_placement(std::string key, const vault_placement &place); - std::string dump_vault_maps(); bool dgn_square_travel_ok(const coord_def &c); |