From f02e50a0b6ad50112e94ed35994bc34e0a1e9c0b Mon Sep 17 00:00:00 2001 From: simon Date: Sun, 16 Nov 2008 15:37:58 +0000 Subject: [PATCH] Patches from Lee Dowling to make Light Up and Net use the CURSOR_SELECT2 button (to, respectively, toggle a "definitely not light" dot and to rotate in the opposite direction from CURSOR_SELECT). git-svn-id: svn://svn.tartarus.org/sgt/puzzles@8299 cda61777-01e9-0310-a592-d414129be87e --- lightup.c | 6 +++--- net.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lightup.c b/lightup.c index 97c0ec8..d9fa079 100644 --- a/lightup.c +++ b/lightup.c @@ -764,7 +764,7 @@ static int try_solve_light(game_state *state, int ox, int oy, unsigned int flags, int lights) { ll_data lld; - int sx,sy,n = 0; + int sx = 0, sy = 0, n = 0; if (lights > 0) 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); cy = FROMCOORD(y); 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 == ' ' || button == '\r' || button == '\n') { ui->cur_visible = 1; cx = ui->cur_x; cy = ui->cur_y; - action = (button == 'i' || button == 'I') ? + action = (button == 'i' || button == 'I' || button == CURSOR_SELECT2) ? FLIP_IMPOSSIBLE : FLIP_LIGHT; } else if (button == CURSOR_UP || button == CURSOR_DOWN || button == CURSOR_RIGHT || button == CURSOR_LEFT) { diff --git a/net.c b/net.c index 1177f80..4fc5268 100644 --- a/net.c +++ b/net.c @@ -2077,14 +2077,14 @@ static char *interpret_move(game_state *state, game_ui *ui, } else if (button == 'a' || button == 's' || button == 'd' || button == 'A' || button == 'S' || button == 'D' || button == 'f' || button == 'F' || - button == CURSOR_SELECT) { + button == CURSOR_SELECT || button == CURSOR_SELECT2) { tx = ui->cur_x; ty = ui->cur_y; if (button == 'a' || button == 'A' || button == CURSOR_SELECT) action = ROTATE_LEFT; else if (button == 's' || button == 'S') action = TOGGLE_LOCK; - else if (button == 'd' || button == 'D') + else if (button == 'd' || button == 'D' || button == CURSOR_SELECT2) action = ROTATE_RIGHT; else if (button == 'f' || button == 'F') action = ROTATE_180; -- 2.11.0