From 8d4b62c9bd1053a1aa76862c760618a986306a56 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 1 Sep 2005 17:25:06 +0000 Subject: [PATCH] Stop Light Up from eating system keypresses, which it was previously doing whenever the cursor was active. [originally from svn r6258] --- lightup.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lightup.c b/lightup.c index ad5d669..b2c9b28 100644 --- a/lightup.c +++ b/lightup.c @@ -1824,11 +1824,13 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, int x, int y, int button) { enum { NONE, FLIP_LIGHT, FLIP_IMPOSSIBLE } action = NONE; - int cx = -1, cy = -1, cv = ui->cur_visible; + int cx = -1, cy = -1; unsigned int flags; - char buf[80], *nullret, *empty = "", c; + char buf[80], *nullret = NULL, *empty = "", c; if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { + if (ui->cur_visible) + nullret = empty; ui->cur_visible = 0; cx = FROMCOORD(x); cy = FROMCOORD(y); @@ -1855,13 +1857,9 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, ui->cur_x = min(max(ui->cur_x, 0), state->w - 1); ui->cur_y = min(max(ui->cur_y, 0), state->h - 1); ui->cur_visible = 1; - } - - /* Always redraw if the cursor is on, or if it's just been - * removed. */ - if (ui->cur_visible) nullret = empty; - else if (cv) nullret = empty; - else nullret = NULL; + nullret = empty; + } else + return NULL; switch (action) { case FLIP_LIGHT: