General cleanups patch from James H:

- missing static in filling.c
 - better robustness in execute_move() in filling.c
 - remove side effects in assert statements
 - remove rogue diagnostic in galaxies.c
 - remove // comment in map.c
 - add more stylus-friendly UI to Pattern
 - bias Unequal towards generating inequality clues rather than numeric

[originally from svn r7344]
This commit is contained in:
Simon Tatham
2007-02-28 21:19:15 +00:00
parent de5ccc9352
commit 9287d95d08
6 changed files with 33 additions and 25 deletions

View File

@ -789,17 +789,28 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
if (x >= 0 && x < state->w && y >= 0 && y < state->h &&
(button == LEFT_BUTTON || button == RIGHT_BUTTON ||
button == MIDDLE_BUTTON)) {
#ifdef STYLUS_BASED
int currstate = state->grid[y * state->w + x];
#endif
ui->dragging = TRUE;
if (button == LEFT_BUTTON) {
ui->drag = LEFT_DRAG;
ui->release = LEFT_RELEASE;
#ifdef STYLUS_BASED
ui->state = currstate == GRID_FULL ? GRID_UNKNOWN : GRID_FULL;
#else
ui->state = GRID_FULL;
#endif
} else if (button == RIGHT_BUTTON) {
ui->drag = RIGHT_DRAG;
ui->release = RIGHT_RELEASE;
#ifdef STYLUS_BASED
ui->state = currstate == GRID_EMPTY ? GRID_UNKNOWN : GRID_EMPTY;
#else
ui->state = GRID_EMPTY;
#endif
} else /* if (button == MIDDLE_BUTTON) */ {
ui->drag = MIDDLE_DRAG;
ui->release = MIDDLE_RELEASE;