Cleanup patch from Ben Hutchings, fixing some odd-looking range

checks. He thinks they were harmless (due to being followed by other
range checks in RIGHTOF_DOT and friends) but it clearly can't hurt
to fix them anyway.

[originally from svn r6709]
This commit is contained in:
Simon Tatham
2006-05-20 11:54:21 +00:00
parent 877900f58a
commit 197e262ba6

View File

@ -1283,7 +1283,7 @@ static int dot_setall_dlines(solver_state *sstate, enum dline dl, int i, int j,
break; break;
case DLINE_DL: case DLINE_DL:
case DLINE_DR: case DLINE_DR:
if (j <= (state)->h && BELOW_DOT(state, i, j) == line_old) { if (j < (state)->h && BELOW_DOT(state, i, j) == line_old) {
LV_BELOW_DOT(state, i, j) = line_new; LV_BELOW_DOT(state, i, j) = line_new;
retval = TRUE; retval = TRUE;
} }
@ -1308,13 +1308,13 @@ static int dot_setall_dlines(solver_state *sstate, enum dline dl, int i, int j,
case DLINE_UR: case DLINE_UR:
case DLINE_DR: case DLINE_DR:
case DLINE_HORIZ: case DLINE_HORIZ:
if (i <= (state)->w && RIGHTOF_DOT(state, i, j) == line_old) { if (i < (state)->w && RIGHTOF_DOT(state, i, j) == line_old) {
LV_RIGHTOF_DOT(state, i, j) = line_new; LV_RIGHTOF_DOT(state, i, j) = line_new;
retval = TRUE; retval = TRUE;
} }
break; break;
case DLINE_VERT: case DLINE_VERT:
if (j <= (state)->h && BELOW_DOT(state, i, j) == line_old) { if (j < (state)->h && BELOW_DOT(state, i, j) == line_old) {
LV_BELOW_DOT(state, i, j) = line_new; LV_BELOW_DOT(state, i, j) = line_new;
retval = TRUE; retval = TRUE;
} }