int w = state->w, h = state->h, wh = w * h;
char buf[80], *nullret = NULL;
- if (button == LEFT_BUTTON || button == CURSOR_SELECT ||
- button == ' ' || button == '\r' || button == '\n') {
+ if (button == LEFT_BUTTON || IS_CURSOR_SELECT(button)) {
int tx, ty;
if (button == LEFT_BUTTON) {
tx = FROMCOORD(x), ty = FROMCOORD(y);
}
}
}
- else if (button == CURSOR_UP || button == CURSOR_DOWN ||
- button == CURSOR_RIGHT || button == CURSOR_LEFT) {
+ else if (IS_CURSOR_MOVE(button)) {
int dx = 0, dy = 0;
switch (button) {
case CURSOR_UP: dy = -1; break;
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)
}
if (flashtime)
- flashframe = flashtime / FLASH_FRAME;
+ flashframe = (int)(flashtime / FLASH_FRAME);
else
flashframe = -1;