diff options
Diffstat (limited to 'anim/src/words.zig')
| -rw-r--r-- | anim/src/words.zig | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/anim/src/words.zig b/anim/src/words.zig index f66f6d2..5411385 100644 --- a/anim/src/words.zig +++ b/anim/src/words.zig @@ -22,7 +22,7 @@ const t = theme.color.text; pub const Clock = struct { cursor: Cursor, box: Rect = .{ .x = theme.canvas.stage.x, .y = theme.canvas.clock_y - 12, .w = theme.canvas.stage.w, .h = 24 }, - /// The map, drawn small under the clock's right end: the minimap. + /// The map: with `CANIM_MAP`, drawn over everything (`Map.wholeMap`). map: ?*const @import("map.zig").Map = null, pub fn draw(k: *const Clock, f: *sk.Frame, at: anim.Placed) void { @@ -60,19 +60,15 @@ pub const Clock = struct { const size = theme.size.mono.context; const base = c.clock_y + 28; const count = u.print("moment {d} of {d}", .{ counted -| now.way[0], now.way[1] -| now.way[0] }); - // Ranged right left of the minimap. - const count_x = (if (k.map != null) theme.minimap.count_end else stage.x + stage.w) - u.width(.mono, size, count); + // Ranged right at the stage's right edge, 1856. + const count_x = stage.x + stage.w - u.width(.mono, size, count); u.text(.mono, size, count_x, base, count, t.faint); // Secondary action: the pace, said quietly. It only fades. if (now.hurried > 0) { const steps = if (now.of > 0) u.print("step {d} of {d}", .{ now.count, now.of }) else u.print("step {d}", .{now.count}); u.faded(now.hurried).text(.mono, size, count_x - u.width(.mono, size, steps) - 3 * ui.advance(size), base, steps, t.dim); } - if (k.map) |m| { - if (@import("map.zig").looking(f)) return m.wholeMap(f, at); - m.fallingOver(f, at); - @import("map.zig").minimap(m, f, at); - } + if (k.map) |m| if (@import("map.zig").looking(f)) m.wholeMap(f, at); } }; |
