From 25ca86b42ddd7d3ba0cffc60352fce57959663d5 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Mon, 20 May 2002 20:08:13 +0000
Subject: [PATCH] Fixed problems with big viewports and small maps (again).
---
src/ui/ui.cpp | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index e45e2e005..1bdbf2775 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -457,12 +457,12 @@ local void SetViewportModeSingle (void)
TheUI.NumViewports = 1;
TheUI.VP[0].X = TheUI.MapArea.X;
- TheUI.VP[0].EndX = TheUI.MapArea.X + TheMap.Width * TileSizeX;
+ TheUI.VP[0].EndX = TheUI.MapArea.X + TheMap.Width * TileSizeX - 1;
if( TheUI.VP[0].EndX > TheUI.MapArea.EndX ) { // Map fits
TheUI.VP[0].EndX = TheUI.MapArea.EndX;
}
TheUI.VP[0].Y = TheUI.MapArea.Y;
- TheUI.VP[0].EndY = TheUI.MapArea.Y + TheMap.Height * TileSizeY;
+ TheUI.VP[0].EndY = TheUI.MapArea.Y + TheMap.Height * TileSizeY - 1;
if( TheUI.VP[0].EndY > TheUI.MapArea.EndY ) { // Map fits
TheUI.VP[0].EndY = TheUI.MapArea.EndY;
}
@@ -472,6 +472,21 @@ local void SetViewportModeSingle (void)
TheUI.VP[0].MapHeight = (TheUI.VP[0].EndY - TheUI.VP[0].Y + TileSizeY) /
TileSizeY;
+ //
+ // Check if the viewport goes outside of the map
+ // Needed for big viewports and small maps
+ //
+
+ if( TheUI.VP[0].MapX+TheUI.VP[0].MapWidth>TheMap.Width ) {
+ TheUI.VP[0].MapX -= TheUI.VP[0].MapWidth + TheUI.VP[0].MapX -
+ TheMap.Width;
+ }
+
+ if( TheUI.VP[0].MapY+TheUI.VP[0].MapHeight>=TheMap.Height ) {
+ TheUI.VP[0].MapY -= TheUI.VP[0].MapHeight + TheUI.VP[0].MapY -
+ TheMap.Height;
+ }
+
TheUI.LastClickedVP = TheUI.ActiveViewport = 0;
}