diff options
Diffstat (limited to 'src/tileset.c')
-rw-r--r-- | src/tileset.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/tileset.c b/src/tileset.c index 7f5634d..7ccdf8b 100644 --- a/src/tileset.c +++ b/src/tileset.c @@ -14,7 +14,7 @@ extern const Tiled2cSet tset_tsj; __attribute__((constructor)) static void match_tile_types() { const auto tset = &tset_tsj; assert(MAX_TILE_ID > tset->tilecount); - rfor (i, 0u, tset->numtiles) { + rfor(i, 0u, tset->numtiles) { const auto tile = &tset->tiles[i]; tile_t2cs[tile->id] = tile; @@ -23,12 +23,12 @@ __attribute__((constructor)) static void match_tile_types() { tile_frames[tile->id] = tile->frames; } } - rfor (i, 0, MAX_TILE_ID) { + rfor(i, 0, MAX_TILE_ID) { tile_frame_id[i] = 0; if (tile_numframes[i]) { tile_visuals[i] = tile_frames[i][0].tileid; - tile_next_frame[i] = tile_frames[i][0].duration * - cfg.fps / 1000; + tile_next_frame[i] = + tile_frames[i][0].duration * cfg.fps / 1000; } else tile_visuals[i] = i; } @@ -39,16 +39,17 @@ void tileset_update() { const unsigned long elapsed = tick - last_tick; last_tick = tick; - rfor (i, 0, MAX_TILE_ID) { - if (!tile_numframes[i]) continue; + rfor(i, 0, MAX_TILE_ID) { + if (!tile_numframes[i]) + continue; tile_next_frame[i] -= elapsed; while (tile_next_frame[i] <= 0) { tile_frame_id[i] += 1; tile_frame_id[i] %= tile_numframes[i]; const auto frame_id = tile_frame_id[i]; tile_visuals[i] = tile_frames[i][frame_id].tileid; - tile_next_frame[i] = tile_frames[i][frame_id] - .duration * cfg.fps / 1000; + tile_next_frame[i] = + tile_frames[i][frame_id].duration * cfg.fps / 1000; } } } @@ -61,12 +62,12 @@ void tile_draw(u32 id, int x, int y) { const bool flip_x = (id & tiled_flip_x) != 0; const bool flip_y = (id & tiled_flip_y) != 0; const auto v = tile_visual(id); - if (v < 0) return; + if (v < 0) + return; const int ix = v % tset_tsj.columns * cfg.tile_width; const int iy = v / tset_tsj.columns * cfg.tile_height; - TZR_DrawImage(TZR_RES(tset_tsj.path + 3), - x, y, ix, iy, cfg.tile_width, cfg.tile_height, - .flip_x=flip_x, .flip_y=flip_y); + TZR_DrawImage(TZR_RES(tset_tsj.path + 3), x, y, ix, iy, cfg.tile_width, + cfg.tile_height, .flip_x = flip_x, .flip_y = flip_y); } u32 tile_type(u32 id) { |