zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Patch from James H to make the Palm compiler stop objecting to my

Browse Source 
(as far as I could tell) perfectly legal use of floats, and also
remove some VC warnings.

[originally from svn r7310]
This commit is contained in:
Simon Tatham
2007-02-22 18:13:12 +00:00
parent 9d9e02f1d5
commit a428c5899d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
galaxies.c
View File

@ -2225,8 +2225,8 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
} else if (button == RIGHT_BUTTON) { } else if (button == RIGHT_BUTTON) {
int px1, py1; int px1, py1;
px = 2*FROMCOORD((float)x) + 0.5; px = 2*(FROMCOORD( (int)((float)x + 0.5) ));
py = 2*FROMCOORD((float)y) + 0.5; py = 2*(FROMCOORD( (int)((float)y + 0.5) ));
dot = NULL; dot = NULL;
@ -2758,13 +2758,13 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
static void draw_arrow(drawing *dr, game_drawstate *ds, static void draw_arrow(drawing *dr, game_drawstate *ds,
int cx, int cy, int ddx, int ddy) int cx, int cy, int ddx, int ddy)
{ {
float vlen = sqrt(ddx*ddx+ddy*ddy); float vlen = (float)sqrt(ddx*ddx+ddy*ddy);
float xdx = ddx/vlen, xdy = ddy/vlen; float xdx = ddx/vlen, xdy = ddy/vlen;
float ydx = -xdy, ydy = xdx; float ydx = -xdy, ydy = xdx;
int e1x = cx + xdx*TILE_SIZE/3, e1y = cy + xdy*TILE_SIZE/3; int e1x = cx + (int)(xdx*TILE_SIZE/3), e1y = cy + (int)(xdy*TILE_SIZE/3);
int e2x = cx - xdx*TILE_SIZE/3, e2y = cy - xdy*TILE_SIZE/3; int e2x = cx - (int)(xdx*TILE_SIZE/3), e2y = cy - (int)(xdy*TILE_SIZE/3);
int adx = (ydx-xdx)*TILE_SIZE/8, ady = (ydy-xdy)*TILE_SIZE/8; int adx = (int)((ydx-xdx)*TILE_SIZE/8), ady = (int)((ydy-xdy)*TILE_SIZE/8);
int adx2 = (-ydx-xdx)*TILE_SIZE/8, ady2 = (-ydy-xdy)*TILE_SIZE/8; int adx2 = (int)((-ydx-xdx)*TILE_SIZE/8), ady2 = (int)((-ydy-xdy)*TILE_SIZE/8);
draw_line(dr, e1x, e1y, e2x, e2y, COL_ARROW); draw_line(dr, e1x, e1y, e2x, e2y, COL_ARROW);
draw_line(dr, e1x, e1y, e1x+adx, e1y+ady, COL_ARROW); draw_line(dr, e1x, e1y, e1x+adx, e1y+ady, COL_ARROW);
@ -3176,7 +3176,7 @@ static void game_print(drawing *dr, game_state *state, int sz)
for (y = 0; y <= 2*h; y++) for (y = 0; y <= 2*h; y++)
for (x = 0; x <= 2*w; x++) for (x = 0; x <= 2*w; x++)
if (SPACE(state, x, y).flags & F_DOT) { if (SPACE(state, x, y).flags & F_DOT) {
draw_circle(dr, COORD(x/2.0), COORD(y/2.0), DOT_SIZE, draw_circle(dr, (int)COORD(x/2.0), (int)COORD(y/2.0), DOT_SIZE,
(SPACE(state, x, y).flags & F_DOT_BLACK ? (SPACE(state, x, y).flags & F_DOT_BLACK ?
black : white), black); black : white), black);
} }