mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-20 23:51:29 -07:00
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]
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user