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

New name UI_UPDATE for interpret_move's return "".

Browse Source 
Now midend.c directly tests the returned pointer for equality to this
value, instead of checking whether it's the empty string.

A minor effect of this is that games may now return a dynamically
allocated empty string from interpret_move() and treat it as just
another legal move description. But I don't expect anyone to be
perverse enough to actually do that! The main purpose is that it
avoids returning a string literal from a function whose return type is
a pointer to _non-const_ char, i.e. we are now one step closer to
being able to make this code base clean under -Wwrite-strings.
This commit is contained in:
Simon Tatham
2017-10-01 12:52:12 +01:00
parent edcf839d4c
commit eeb2db283d
41 changed files with 217 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
towers.c
View File

@ -1349,7 +1349,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->hpencil = 0;
}
ui->hcursor = 0;
return ""; /* UI activity occurred */
return UI_UPDATE;
}
if (button == RIGHT_BUTTON) {
/*
@ -1369,7 +1369,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->hshow = 0;
}
ui->hcursor = 0;
return ""; /* UI activity occurred */
return UI_UPDATE;
}
} else if (button == LEFT_BUTTON) {
if (is_clue(state, tx, ty)) {
@ -1394,13 +1394,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
}
move_cursor(button, &ui->hx, &ui->hy, w, w, 0);
ui->hshow = ui->hcursor = 1;
return "";
return UI_UPDATE;
}
if (ui->hshow &&
(button == CURSOR_SELECT)) {
ui->hpencil = 1 - ui->hpencil;
ui->hcursor = 1;
return "";
return UI_UPDATE;
}
if (ui->hshow &&