fixed tileBufferIsTileOnBuffer() region check

previous version allowed drawing on outermost margins, which resulted in drawing stuff when it shouldn't be drawn
AmigaPorts · Apr 16, 2019 · 5ba6a43 · 5ba6a43
1 parent 5f974de
commit 5ba6a43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ace/managers/viewport/scrollbuffer.c b/src/ace/managers/viewport/scrollbuffer.c
@@ -233,7 +233,7 @@ void scrollBufferReset(
 	pManager->uwVpHeightPrev = 0;
 	pManager->uBfrBounds.sUwCoord.uwX = uwBoundWidth;
 	pManager->uBfrBounds.sUwCoord.uwY = uwBoundHeight;
-	// TODO optimize avail height to power of two so that modulo can be an AND
+	// Optimize avail height to power of two so that modulo can be an AND
 	pManager->uwBmAvailHeight = nearestPowerOf2(ubMarginWidth * (blockCountCeil(uwVpHeight, ubMarginWidth) + 4));
 
 	// Destroy old buffer bitmap

diff --git a/src/ace/managers/viewport/tilebuffer.c b/src/ace/managers/viewport/tilebuffer.c
@@ -87,6 +87,7 @@ tTileBufferManager *tileBufferCreate(void *pTags, ...) {
 		logWrite(
 			"ERR: No tile boundaries (TAG_TILEBUFFER_BOUND_TILE_X or _Y) specified!\n"
 		);
+		goto fail;
 	}
 
 	pManager->pTileData = 0;
@@ -538,9 +539,9 @@ UBYTE tileBufferIsTileOnBuffer(
 ) {
 	UBYTE ubTileShift = pManager->ubTileShift;
 	UWORD uwStartX = MAX(0, (pManager->pCamera->uPos.sUwCoord.uwX >> ubTileShift) -1);
-	UWORD uwEndX = uwStartX + (pManager->uwMarginedWidth >> ubTileShift);
+	UWORD uwEndX = uwStartX + ((pManager->uwMarginedWidth >> ubTileShift) - 2);
 	UWORD uwStartY = MAX(0, (pManager->pCamera->uPos.sUwCoord.uwY >> ubTileShift) -1);
-	UWORD uwEndY = uwStartY + (pManager->uwMarginedHeight >> ubTileShift);
+	UWORD uwEndY = uwStartY + ((pManager->uwMarginedHeight >> ubTileShift) - 2);
 
 	if(
 		uwStartX <= uwTileX && uwTileX <= uwEndX && uwTileX &&