summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-04 14:42:18 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-04 14:42:18 +0000
commitda0c3f0c317cfb21e88aecbbb90388cc6d087cfe (patch)
treec77e9da95d3bf36d6445b8ee48fc6ae3690b4c56
parentf7dc52138f8412bc2f041657f674a5d135e6bdfc (diff)
downloadcrawl-ref-da0c3f0c317cfb21e88aecbbb90388cc6d087cfe.tar.gz
crawl-ref-da0c3f0c317cfb21e88aecbbb90388cc6d087cfe.zip
Fixing problem where the minimap could sometimes be placed partially off screen.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7122 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/tilesdl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 0ac68398ac..af7755005d 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -853,9 +853,11 @@ void TilesFramework::do_layout()
// recenter map above inventory
int map_cen_x = m_region_self_inv->sx + (m_region_self_inv->wx) / 2;
+ map_cen_x = std::min(map_cen_x, (int)(m_windowsz.x - m_region_map->wx));
m_region_map->place(map_cen_x - m_region_map->wy / 2, m_region_map->sy,
map_margin);
+
// Place regions for crt layer
m_region_crt->place(0, 0, margin);