From 1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 13 Sep 2008 18:29:20 +0000 Subject: Patch from James H providing lots more paranoid casting. Also one actual behaviour change: Untangle now permits dragging with the right mouse button, which has exactly the same effect as it does with the left. (Harmless on desktop platforms, but helpful when "right-click" is achieved by press-and-hold; now the drag takes place even if you hesitate first.) [originally from svn r8177] --- samegame.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'samegame.c') diff --git a/samegame.c b/samegame.c index 2b77c26..5a8c2cb 100644 --- a/samegame.c +++ b/samegame.c @@ -1126,7 +1126,7 @@ static char *sel_movedesc(game_ui *ui, game_state *state) if (ui->tiles[i] & TILE_SELECTED) { sprintf(buf, "%s%d", sep, i); sep = ","; - if (retlen + strlen(buf) >= retsize) { + if (retlen + (int)strlen(buf) >= retsize) { retsize = retlen + strlen(buf) + 256; ret = sresize(ret, retsize, char); } @@ -1419,9 +1419,9 @@ static float *game_colours(frontend *fe, int *ncolours) ret[COL_HIGHLIGHT * 3 + 1] = 1.0F; ret[COL_HIGHLIGHT * 3 + 2] = 1.0F; - ret[COL_LOWLIGHT * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 2.0 / 3.0; - ret[COL_LOWLIGHT * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 2.0 / 3.0; - ret[COL_LOWLIGHT * 3 + 2] = ret[COL_BACKGROUND * 3 + 2] * 2.0 / 3.0; + ret[COL_LOWLIGHT * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 2.0F / 3.0F; + ret[COL_LOWLIGHT * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 2.0F / 3.0F; + ret[COL_LOWLIGHT * 3 + 2] = ret[COL_BACKGROUND * 3 + 2] * 2.0F / 3.0F; *ncolours = NCOLOURS; return ret; -- cgit v1.1