From 5428ee5ae1c8184baac3e57ac82012dab8123090 Mon Sep 17 00:00:00 2001
From: silversurfer <silversurfer@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 8 Sep 2013 14:44:15 +0000
Subject: [PATCH] Bugfix for scrolling in high resolutions (by Moa)

It was possible to scroll beyond the render area in upper right corner which caused graphical artifacts.

http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/324891/Re_Code_Snippets.html#Post324891


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 TileEngine/renderworld.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp
index 01d04d9c..73b63d85 100644
--- a/TileEngine/renderworld.cpp
+++ b/TileEngine/renderworld.cpp
@@ -4175,6 +4175,16 @@ BOOLEAN ApplyScrolling( INT16 sTempRenderCenterX, INT16 sTempRenderCenterY, BOOL
 		// Force adjustment, if true
 		if ( fForceAdjust )
 		{
+			if ( fOutRight )
+			{
+				CorrectRenderCenter( (INT16)( gsTRX - sX_S ) , sScreenCenterY , &sNewScreenX, &sNewScreenY );
+				FromScreenToCellCoordinates( sNewScreenX, sNewScreenY , &sTempPosX_W, &sTempPosY_W );
+
+				sTempRenderCenterX = sTempPosX_W;
+				sTempRenderCenterY = sTempPosY_W;
+				fScrollGood = TRUE;
+			}
+			
 			if ( fOutTop )
 			{
 				// Adjust screen coordinates on the Y!
@@ -4208,17 +4218,6 @@ BOOLEAN ApplyScrolling( INT16 sTempRenderCenterX, INT16 sTempRenderCenterY, BOOL
 
 				fScrollGood = TRUE;
 			}
-
-			if ( fOutRight )
-			{
-				CorrectRenderCenter( (INT16)( gsTRX - sX_S ) , sScreenCenterY , &sNewScreenX, &sNewScreenY );
-				FromScreenToCellCoordinates( sNewScreenX, sNewScreenY , &sTempPosX_W, &sTempPosY_W );
-
-				sTempRenderCenterX = sTempPosX_W;
-				sTempRenderCenterY = sTempPosY_W;
-				fScrollGood = TRUE;
-			}
-
 		}
 		else
 		{