aboutsummaryrefslogtreecommitdiff
path: root/flip.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2008-09-13 18:29:20 +0000
committerSimon Tatham <anakin@pobox.com>2008-09-13 18:29:20 +0000
commit1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96 (patch)
tree7d148a3d1d265a36957636faa3b5e7aba92bd1f9 /flip.c
parent5ead207060a3e1f74ad6200fdf02934457394bc2 (diff)
downloadpuzzles-1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96.zip
puzzles-1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96.tar.gz
puzzles-1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96.tar.bz2
puzzles-1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96.tar.xz
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]
Diffstat (limited to 'flip.c')
-rw-r--r--flip.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/flip.c b/flip.c
index d430217..d7fbd8e 100644
--- a/flip.c
+++ b/flip.c
@@ -1099,12 +1099,12 @@ static void draw_tile(drawing *dr, game_drawstate *ds,
coords[0] = bx + TILE_SIZE;
coords[1] = by;
- coords[2] = bx + TILE_SIZE * animtime;
- coords[3] = by + TILE_SIZE * animtime;
+ coords[2] = bx + (int)((float)TILE_SIZE * animtime);
+ coords[3] = by + (int)((float)TILE_SIZE * animtime);
coords[4] = bx;
coords[5] = by + TILE_SIZE;
- coords[6] = bx + TILE_SIZE - TILE_SIZE * animtime;
- coords[7] = by + TILE_SIZE - TILE_SIZE * animtime;
+ coords[6] = bx + TILE_SIZE - (int)((float)TILE_SIZE * animtime);
+ coords[7] = by + TILE_SIZE - (int)((float)TILE_SIZE * animtime);
colour = (tile & 1 ? COL_WRONG : COL_RIGHT);
if (animtime < 0.5)
@@ -1185,7 +1185,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
}
if (flashtime)
- flashframe = flashtime / FLASH_FRAME;
+ flashframe = (int)(flashtime / FLASH_FRAME);
else
flashframe = -1;