From 847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 8 Dec 2008 22:46:17 +0000 Subject: 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 --- crawl-ref/source/maps.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/maps.h') 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(); -- cgit v1.2.3-54-g00ecf