Fix warnings generated by gcc 4.6.0 about variables set but not

thereafter read. Most of these changes are just removal of pointless
stuff or trivial reorganisations; one change is actually substantive,
and fixes a bug in Keen's clue selection (the variable 'bad' was
unreferenced not because I shouldn't have set it, but because I
_should_ have referenced it!).

[originally from svn r9164]
This commit is contained in:
Simon Tatham
2011-05-04 18:22:14 +00:00
parent 4bab5e531b
commit 2efc77d2fd
14 changed files with 31 additions and 54 deletions

View File

@ -1059,7 +1059,7 @@ static char *interpret_move(game_state *state, game_ui *ui,
game_drawstate *ds, int x, int y, int button)
{
int cx, cy;
int n, dx, dy;
int dx, dy;
char buf[80];
button &= ~MOD_MASK;
@ -1101,7 +1101,6 @@ static char *interpret_move(game_state *state, game_ui *ui,
if (cx == -1) dx = +1;
else if (cx == state->width) dx = -1;
else return NULL;
n = state->width;
dy = 0;
}
else if (cx >= 0 && cx < state->width && cx != state->cx)
@ -1109,7 +1108,6 @@ static char *interpret_move(game_state *state, game_ui *ui,
if (cy == -1) dy = +1;
else if (cy == state->height) dy = -1;
else return NULL;
n = state->height;
dx = 0;
}
else
@ -1585,7 +1583,7 @@ static void draw_arrow_for_cursor(drawing *dr, game_drawstate *ds,
static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
game_state *state, int dir, game_ui *ui, float t, float ft)
{
int x, y, tx, ty, frame;
int x, y, frame;
unsigned char *active;
float xshift = 0.0;
float yshift = 0.0;
@ -1677,7 +1675,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
t = ANIM_TIME - t;
}
tx = ty = -1;
if (oldstate && (t < ANIM_TIME)) {
/*
* We're animating a slide, of row/column number