From: Simon Tatham <anakin@pobox.com>
Date: Tue, 12 Jan 2010 18:34:06 +0000 (+0000)
Subject: Add a couple more checks to the 3d collision detection, without
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=7aefa1110afd73c9bfba0ba3af34e8ce78b96ce6;p=sgt-puzzles.git

Add a couple more checks to the 3d collision detection, without
which a click miles above the invisible RH surface of a tower would
sometimes select that tower.

[originally from svn r8833]
---

diff --git a/towers.c b/towers.c
index f06f2ad..c3372a3 100644
--- a/towers.c
+++ b/towers.c
@@ -1290,10 +1290,11 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 			(x - ox >= 0 && x - ox < TILESIZE &&
 			 y - oy >= 0 && y - oy < TILESIZE) ||
 			/* in triangle between top-left corners? */
-			(ox > bx && x >= bx && x <= ox &&
+			(ox > bx && x >= bx && x <= ox && y <= by &&
 			 (by-y) * (ox-bx) <= (by-oy) * (x-bx)) ||
 			/* in triangle between bottom-right corners? */
 			(ox > bx && x >= bx+TILESIZE && x <= ox+TILESIZE &&
+			 y >= oy+TILESIZE &&
 			 (by-y+TILESIZE)*(ox-bx) >= (by-oy)*(x-bx-TILESIZE))) {
 			tx = cx;
 			ty = cy;