diff options
| author | Simon Tatham <anakin@pobox.com> | 2008-09-13 18:29:20 +0000 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2008-09-13 18:29:20 +0000 |
| commit | 1d661ec46b8d7216bc6f2e34a4d6b9cc9fdc6f96 (patch) | |
| tree | 7d148a3d1d265a36957636faa3b5e7aba92bd1f9 /midend.c | |
| parent | 5ead207060a3e1f74ad6200fdf02934457394bc2 (diff) | |
| download | puzzles-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 'midend.c')
| -rw-r--r-- | midend.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -335,9 +335,9 @@ void midend_new_game(midend *me) char newseed[16]; int i; newseed[15] = '\0'; - newseed[0] = '1' + random_upto(me->random, 9); + newseed[0] = '1' + (char)random_upto(me->random, 9); for (i = 1; i < 15; i++) - newseed[i] = '0' + random_upto(me->random, 10); + newseed[i] = '0' + (char)random_upto(me->random, 10); sfree(me->seedstr); me->seedstr = dupstr(newseed); @@ -832,9 +832,9 @@ float *midend_colours(midend *me, int *ncolours) buf[k] = '\0'; if ((e = getenv(buf)) != NULL && sscanf(e, "%2x%2x%2x", &r, &g, &b) == 3) { - ret[i*3 + 0] = r / 255.0; - ret[i*3 + 1] = g / 255.0; - ret[i*3 + 2] = b / 255.0; + ret[i*3 + 0] = r / 255.0F; + ret[i*3 + 1] = g / 255.0F; + ret[i*3 + 2] = b / 255.0F; } } } @@ -1304,7 +1304,7 @@ char *midend_rewrite_statusbar(midend *me, char *text) char timebuf[100], *ret; int min, sec; - sec = me->elapsed; + sec = (int)me->elapsed; min = sec / 60; sec %= 60; sprintf(timebuf, "[%d:%02d] ", min, sec); @@ -1608,7 +1608,7 @@ char *midend_deserialise(midend *me, uistr = val; val = NULL; } else if (!strcmp(key, "TIME")) { - elapsed = atof(val); + elapsed = (float)atof(val); } else if (!strcmp(key, "NSTATES")) { nstates = atoi(val); if (nstates <= 0) { |