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

Patches from Lee Dowling to make Light Up and Net use the

Browse Source 
CURSOR_SELECT2 button (to, respectively, toggle a "definitely not
light" dot and to rotate in the opposite direction from
CURSOR_SELECT).

[originally from svn r8299]
This commit is contained in:
Simon Tatham
2008-11-16 15:37:58 +00:00
parent ce237a73ee
commit 466aa6e532
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lightup.c
View File

@ -764,7 +764,7 @@ static int try_solve_light(game_state *state, int ox, int oy,
unsigned int flags, int lights) unsigned int flags, int lights)
{ {
ll_data lld; ll_data lld;
int sx,sy,n = 0; int sx = 0, sy = 0, n = 0;
if (lights > 0) return 0; if (lights > 0) return 0;
if (flags & F_BLACK) return 0; if (flags & F_BLACK) return 0;
@ -1840,13 +1840,13 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
cx = FROMCOORD(x); cx = FROMCOORD(x);
cy = FROMCOORD(y); cy = FROMCOORD(y);
action = (button == LEFT_BUTTON) ? FLIP_LIGHT : FLIP_IMPOSSIBLE; action = (button == LEFT_BUTTON) ? FLIP_LIGHT : FLIP_IMPOSSIBLE;
} else if (button == CURSOR_SELECT || } else if (button == CURSOR_SELECT || button == CURSOR_SELECT2 ||
button == 'i' || button == 'I' || button == 'i' || button == 'I' ||
button == ' ' || button == '\r' || button == '\n') { button == ' ' || button == '\r' || button == '\n') {
ui->cur_visible = 1; ui->cur_visible = 1;
cx = ui->cur_x; cx = ui->cur_x;
cy = ui->cur_y; cy = ui->cur_y;
action = (button == 'i' || button == 'I') ? action = (button == 'i' || button == 'I' || button == CURSOR_SELECT2) ?
FLIP_IMPOSSIBLE : FLIP_LIGHT; FLIP_IMPOSSIBLE : FLIP_LIGHT;
} else if (button == CURSOR_UP || button == CURSOR_DOWN || } else if (button == CURSOR_UP || button == CURSOR_DOWN ||
button == CURSOR_RIGHT || button == CURSOR_LEFT) { button == CURSOR_RIGHT || button == CURSOR_LEFT) {

4
net.c
View File

@ -2077,14 +2077,14 @@ static char *interpret_move(game_state *state, game_ui *ui,
} else if (button == 'a' || button == 's' || button == 'd' || } else if (button == 'a' || button == 's' || button == 'd' ||
button == 'A' || button == 'S' || button == 'D' || button == 'A' || button == 'S' || button == 'D' ||
button == 'f' || button == 'F' || button == 'f' || button == 'F' ||
button == CURSOR_SELECT) { button == CURSOR_SELECT || button == CURSOR_SELECT2) {
tx = ui->cur_x; tx = ui->cur_x;
ty = ui->cur_y; ty = ui->cur_y;
if (button == 'a' || button == 'A' || button == CURSOR_SELECT) if (button == 'a' || button == 'A' || button == CURSOR_SELECT)
action = ROTATE_LEFT; action = ROTATE_LEFT;
else if (button == 's' || button == 'S') else if (button == 's' || button == 'S')
action = TOGGLE_LOCK; action = TOGGLE_LOCK;
else if (button == 'd' || button == 'D') else if (button == 'd' || button == 'D' || button == CURSOR_SELECT2)
action = ROTATE_RIGHT; action = ROTATE_RIGHT;
else if (button == 'f' || button == 'F') else if (button == 'f' || button == 'F')
action = ROTATE_180; action = ROTATE_180;