From 58fa3dd539ad0ee7ebb44ec68515bdc22956c095 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Fri, 7 Sep 2012 00:51:14 +0100
Subject: [PATCH] Fix some off-by-one mouse clamping issues

---
 src/game/GameController.cpp | 2 +-
 src/game/GameView.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index aecdeaf3d..59e1e3423 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -341,7 +341,7 @@ ui::Point GameController::PointTranslate(ui::Point point)
 	if(point.X >= XRES)
 		point.X = XRES-1;
 	if(point.Y >= YRES)
-		point.Y = YRES+1;
+		point.Y = YRES-1;
 	if(point.Y < 0)
 		point.Y = 0;
 	if(point.X < 0)
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 56dbbcebb..05ffcab57 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -997,7 +997,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
 		}
 		return;
 	}
-	if(currentMouse.X > 0 && currentMouse.X < XRES && currentMouse.Y > 0 && currentMouse.Y < YRES && !(zoomEnabled && !zoomCursorFixed))
+	if(currentMouse.X >= 0 && currentMouse.X < XRES && currentMouse.Y >= 0 && currentMouse.Y < YRES && !(zoomEnabled && !zoomCursorFixed))
 	{
 		if(button == BUTTON_LEFT)
 			toolIndex = 0;
@@ -1761,7 +1761,7 @@ void GameView::OnDraw()
 	{
 		ren->clearScreen(1.0f);
 		ren->RenderBegin();
-		if(selectMode == SelectNone && (!zoomEnabled || zoomCursorFixed) && activeBrush && currentMouse.X > 0 && currentMouse.X < XRES && currentMouse.Y > 0 && currentMouse.Y < YRES)
+		if(selectMode == SelectNone && (!zoomEnabled || zoomCursorFixed) && activeBrush && currentMouse.X >= 0 && currentMouse.X < XRES && currentMouse.Y >= 0 && currentMouse.Y < YRES)
 		{
 			ui::Point finalCurrentMouse = c->PointTranslate(currentMouse);
 			ui::Point initialDrawPoint = drawPoint1;