Skip to content

Commit de289a9

Browse files
committed
fix: player mode progress bar going past end of the song
1 parent a36c71e commit de289a9

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

scripts/control_draw/control_draw.gml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,9 +2173,11 @@ function control_draw() {
21732173
draw_set_halign(fa_left)
21742174
draw_set_alpha(1)
21752175

2176+
2177+
var bar_pos = min(marker_pos, enda)
21762178
if (isplayer) {
21772179
if (!dropmode) {
2178-
marker_pos = draw_dragbar(marker_pos, enda, rw / 2 - 200, rh / 2 + 25, 400, 1, time_str((clamp(((mouse_x - (rw / 2 - 200)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
2180+
bar_pos = draw_dragbar(bar_pos, enda, rw / 2 - 200, rh / 2 + 25, 400, 1, time_str((clamp(((mouse_x - (rw / 2 - 200)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
21792181
draw_set_halign(fa_left)
21802182
draw_theme_color()
21812183
if (blackout) draw_set_color(c_white)
@@ -2185,7 +2187,7 @@ function control_draw() {
21852187
dropalpha = 1
21862188
} else {
21872189
draw_set_alpha(dropalpha)
2188-
marker_pos = draw_dragbar(marker_pos, enda, 93 - 84 + 100, 52 + 15, 400, 1, time_str((clamp(((mouse_x - (93 - 84 + 100)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
2190+
bar_pos = draw_dragbar(bar_pos, enda, 93 - 84 + 100, 52 + 15, 400, 1, time_str((clamp(((mouse_x - (93 - 84 + 100)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
21892191
draw_set_alpha(1)
21902192
if (mouse_x != mouse_xprev || mouse_y != mouse_yprev || mouse_rectangle(0, 0, 530, 90) || window != 0) {
21912193
dropalpha = 1
@@ -2198,6 +2200,9 @@ function control_draw() {
21982200
draw_set_halign(fa_left)
21992201
}
22002202
}
2203+
if (marker_pos != bar_pos) { // User dragged the bar
2204+
marker_pos = bar_pos
2205+
}
22012206

22022207
if (!isplayer) {
22032208
// Bars-beats-sixteenths

0 commit comments

Comments
 (0)