diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 22:46:17 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 22:46:17 +0000 |
commit | 847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe (patch) | |
tree | f5fb2f917eff4b50a42899f1fe6b22198a259e0e /crawl-ref/source/maps.h | |
parent | 7cc66e61e50963ba90a5db8db19cf75890d3c733 (diff) | |
download | crawl-ref-847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe.tar.gz crawl-ref-847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe.zip |
Some more recent trunk commits -> 0.4.
7429, 7672, 7716, 7729, 6646, 7760
* Descriptions, messages, help screen.
Also:
* Don't allow monsters to polymorph into uniques.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7790 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.h')
-rw-r--r-- | crawl-ref/source/maps.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/maps.h b/crawl-ref/source/maps.h index d420642a43..6908c2af6f 100644 --- a/crawl-ref/source/maps.h +++ b/crawl-ref/source/maps.h @@ -45,7 +45,8 @@ int vault_main(map_type vgrid, // Given a rectangular region, slides it to fit into the map. size must be // smaller than (GXM,GYM). -void fit_region_into_map_bounds(coord_def &pos, const coord_def &size); +void fit_region_into_map_bounds(coord_def &pos, const coord_def &size, + int margin = 0); const map_def *map_by_index(int index); int map_count(); |