From d9af4a90a1b242645d38ff1427793ba86c1805b7 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Sat, 10 Feb 2007 18:28:17 +0000
Subject: Fixed the bug in the scrolling limitation that made it possible to
 scroll outside of the map in the south and east.

---
 src/gui/viewport.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 90f3536c..098b913a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -134,18 +134,22 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         mViewY = player_y;
     };
 
-    if (mMap) {
+    // Don't move camera so that the end of the map is on screen
+    int viewXmax = ((mMap->getWidth() - 1) * 32) - graphics->getWidth();
+    int viewYmax = ((mMap->getHeight() - 1) * 32) - graphics->getHeight();
+    if (mMap)
+    {
         if (mViewX < 0) {
             mViewX = 0;
         }
         if (mViewY < 0) {
             mViewY = 0;
         }
-        if (mViewX > (mMap->getWidth() - midTileX) * 32) {
-            mViewX = (mMap->getWidth() - midTileX) * 32;
+        if (mViewX > viewXmax) {
+            mViewX = viewXmax;
         }
-        if (mViewY > (mMap->getHeight() - midTileY) * 32) {
-            mViewY = (mMap->getHeight() - midTileY) * 32;
+        if (mViewY > viewYmax) {
+            mViewY = viewYmax;
         }
     }
 
-- 
cgit v1.2.3-70-g09d2