zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

More forgiving selection of dragging targets.

Browse Source 
[originally from svn r7574]
This commit is contained in:
Simon Tatham
2007-05-12 13:13:39 +00:00
parent be8f9c5284
commit e6116563bd
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
unfinished/slide.c
View File

@ -5,9 +5,6 @@
/* /*
* TODO: * TODO:
* *
* - The dragging semantics are still subtly wrong in complex
* cases.
*
* - Improve the generator. * - Improve the generator.
* * actually, we seem to be mostly sensible already now. I * * actually, we seem to be mostly sensible already now. I
* want more choice over the type of main block and location * want more choice over the type of main block and location
@ -1345,17 +1342,36 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
*/ */
return ""; return "";
} else if (button == LEFT_DRAG && ui->dragging) { } else if (button == LEFT_DRAG && ui->dragging) {
int dist, distlimit, dx, dy, s, px, py;
tx = FROMCOORD(x); tx = FROMCOORD(x);
ty = FROMCOORD(y); ty = FROMCOORD(y);
tx -= ui->drag_offset_x; tx -= ui->drag_offset_x;
ty -= ui->drag_offset_y; ty -= ui->drag_offset_y;
if (tx < 0 || tx >= w || ty < 0 || ty >= h ||
!ui->reachable[ty*w+tx])
return NULL; /* this drag has no effect */
ui->drag_currpos = ty*w+tx; /*
* Now search outwards from (tx,ty), in order of Manhattan
* distance, until we find a reachable square.
*/
distlimit = w+tx;
distlimit = max(distlimit, h+ty);
distlimit = max(distlimit, tx);
distlimit = max(distlimit, ty);
for (dist = 0; dist <= distlimit; dist++) {
for (dx = -dist; dx <= dist; dx++)
for (s = -1; s <= +1; s += 2) {
dy = s * (dist - abs(dx));
px = tx + dx;
py = ty + dy;
if (px >= 0 && px < w && py >= 0 && py < h &&
ui->reachable[py*w+px]) {
ui->drag_currpos = py*w+px;
return ""; return "";
}
}
}
return NULL; /* give up - this drag has no effect */
} else if (button == LEFT_RELEASE && ui->dragging) { } else if (button == LEFT_RELEASE && ui->dragging) {
char data[256], *str; char data[256], *str;