feat: remove 'loop to bar end' option

There WILL be backlash. Reverting in 3, 2, 1...

Author: Bentroen

scripts/control_create/control_create.gml

@@ -393,7 +393,7 @@ function control_create() {
 	loop = 0
 	loopmax = 0
 	loopstart = 0
-	looptobarend = 1
+	//looptobarend = 1
 	timestoloop = loopmax
 	settempo = 0 // Tempo input box clicked
 	taptempo = 0 // Tempo in measuring

scripts/control_draw/control_draw.gml

@@ -1060,7 +1060,7 @@ function control_draw() {
 			}
 		}
 		//loop song
-		if (loop_session = 1 && marker_pos > enda + 1 && (!looptobarend || marker_pos mod (timesignature * 4) < 1)) {
+		if (loop_session = 1 && marker_pos > enda + 1) { // && (!looptobarend || marker_pos mod (timesignature * 4) < 1)
 			--timestoloop
 			starta = loopstart
 			marker_pos = starta

scripts/draw_window_preferences/draw_window_preferences.gml

@@ -553,14 +553,14 @@ function draw_window_preferences() {
 	    if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 170, marker_start, "Start playing in section", "Whether to always start playing\nat the start of the active section.")) marker_start=!marker_start
 	    if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 190, marker_end, "Stop playing after section", "Whether to stop playing when the\nmarker passes the active section.")) marker_end=!marker_end
 		if (theme = 3) draw_theme_font(font_info_med)
-	    draw_areaheader(x1 + 22, y1 + 244 + (theme = 3) * 22, 218, 140, "Playing")
+	    draw_areaheader(x1 + 22, y1 + 244 + (theme = 3) * 22, 218, 120, "Playing")
 		if (theme = 3) draw_theme_font(font_main)
 	    if (draw_checkbox(x1 + 32, y1 + 244 + 16 + (theme = 3) * 22, realvolume, "Show layer volumes", "Whether to show the volume of layers.")) realvolume=!realvolume
 		if (draw_checkbox(x1 + 32, y1 + 264 + 16 + (theme = 3) * 22, realstereo, "Disable stereo", "Disables stereo playback.")) realstereo = !realstereo
-		if (draw_checkbox(x1 + 32, y1 + 284 + 16 + (theme = 3) * 22, looptobarend, "Loop to bar end", "Loops to the end of the bar/measure.")) looptobarend = !looptobarend
-		if (draw_checkbox(x1 + 32, y1 + 304 + 16 + (theme = 3) * 22, show_soundcount, "Show number of active sounds", "Displays the number of sounds that are\ncurrently playing in the status bar.")) show_soundcount = !show_soundcount
-		if (draw_checkbox(x1 + 32, y1 + 324 + 16 + (theme = 3) * 22, channelstoggle, "Use more audio channels", "Whether to increase the number\nof sounds that can play at once.")) channelstoggle = !channelstoggle
-		if (draw_checkbox(x1 + 32, y1 + 344 + 16 + (theme = 3) * 22, taskbar, "Enable taskbar indicator", "Whether to display the song\nprogress on the taskbar.")) taskbar = !taskbar
+		//if (draw_checkbox(x1 + 32, y1 + 284 + 16 + (theme = 3) * 22, looptobarend, "Loop to bar end", "Loops to the end of the bar/measure.")) looptobarend = !looptobarend
+		if (draw_checkbox(x1 + 32, y1 + 284 + 16 + (theme = 3) * 22, show_soundcount, "Show number of active sounds", "Displays the number of sounds that are\ncurrently playing in the status bar.")) show_soundcount = !show_soundcount
+		if (draw_checkbox(x1 + 32, y1 + 304 + 16 + (theme = 3) * 22, channelstoggle, "Use more audio channels", "Whether to increase the number\nof sounds that can play at once.")) channelstoggle = !channelstoggle
+		if (draw_checkbox(x1 + 32, y1 + 324 + 16 + (theme = 3) * 22, taskbar, "Enable taskbar indicator", "Whether to display the song\nprogress on the taskbar.")) taskbar = !taskbar
 		if (theme = 3) draw_theme_font(font_info_med)
 		draw_areaheader(x1 + 233 + 22, y1 + 244 + (theme = 3) * 22, 223, 60, "Tempo unit")
 		if (theme = 3) draw_theme_font(font_main)
@@ -577,14 +577,14 @@ function draw_window_preferences() {
 	    if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 170, marker_start, "在区间时开始播放", "有区间存在时是否在区间起始处开始播放。")) marker_start=!marker_start
 	    if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 190, marker_end, "在区间后停止播放", "有区间存在时是否在区间结束处停止播放。")) marker_end=!marker_end
 		if (theme = 3) draw_theme_font(font_info_med)
-	    draw_areaheader(x1 + 22, y1 + 244 + (theme = 3) * 22, 218, 140, "播放")
+	    draw_areaheader(x1 + 22, y1 + 244 + (theme = 3) * 22, 218, 120, "播放")
 		if (theme = 3) draw_theme_font(font_main)
 	    if (draw_checkbox(x1 + 32, y1 + 244 + 16 + (theme = 3) * 22, realvolume, "显示每层音量", "是否显示每层的音量。")) realvolume=!realvolume
 		if (draw_checkbox(x1 + 32, y1 + 264 + 16 + (theme = 3) * 22, realstereo, "关闭立体声", "关闭立体声音效。")) realstereo = !realstereo
-		if (draw_checkbox(x1 + 32, y1 + 284 + 16 + (theme = 3) * 22, looptobarend, "循环至小节尾", "到小节尾再循环。")) looptobarend = !looptobarend
-		if (draw_checkbox(x1 + 32, y1 + 304 + 16 + (theme = 3) * 22, show_soundcount, "显示正在播放的声音数", "在状态栏里显示正在播放的声音数。")) show_soundcount = !show_soundcount
-		if (draw_checkbox(x1 + 32, y1 + 324 + 16 + (theme = 3) * 22, channelstoggle, "提升声音限制", "提升可同时播放的声音数。")) channelstoggle = !channelstoggle
-		if (draw_checkbox(x1 + 32, y1 + 344 + 16 + (theme = 3) * 22, taskbar, "启用任务栏进度", "是否在任务栏显示当前歌曲的进度。")) taskbar = !taskbar
+		//if (draw_checkbox(x1 + 32, y1 + 284 + 16 + (theme = 3) * 22, looptobarend, "循环至小节尾", "到小节尾再循环。")) looptobarend = !looptobarend
+		if (draw_checkbox(x1 + 32, y1 + 284 + 16 + (theme = 3) * 22, show_soundcount, "显示正在播放的声音数", "在状态栏里显示正在播放的声音数。")) show_soundcount = !show_soundcount
+		if (draw_checkbox(x1 + 32, y1 + 304 + 16 + (theme = 3) * 22, channelstoggle, "提升声音限制", "提升可同时播放的声音数。")) channelstoggle = !channelstoggle
+		if (draw_checkbox(x1 + 32, y1 + 324 + 16 + (theme = 3) * 22, taskbar, "启用任务栏进度", "是否在任务栏显示当前歌曲的进度。")) taskbar = !taskbar
 		if (theme = 3) draw_theme_font(font_info_med)
 		draw_areaheader(x1 + 233 + 22, y1 + 244 + (theme = 3) * 22, 223, 60, "速度单位")
 		if (theme = 3) draw_theme_font(font_main)

scripts/load_settings/load_settings.gml

@@ -53,7 +53,7 @@ function load_settings() {
 	marker_end =         ini_read_real(  "preferences", "marker_end",         marker_end)
 	realvolume =         ini_read_real(  "preferences", "show_layer_volumes", realvolume)
 	realstereo =         ini_read_real(  "preferences", "use_stereo",         realstereo)
-	looptobarend =       ini_read_real(  "preferences", "loop_to_bar_end",    looptobarend)
+	//looptobarend =       ini_read_real(  "preferences", "loop_to_bar_end",    looptobarend)
 	show_soundcount =    ini_read_real(  "preferences", "show_soundcount",    show_soundcount)
 	use_bpm =            ini_read_real(  "preferences", "use_bpm",            use_bpm)
 	save_version =       ini_read_real(  "preferences", "save_version",       save_version)

scripts/save_settings/save_settings.gml

@@ -51,7 +51,7 @@ function save_settings() {
 	ini_write_real_clean("preferences", "marker_end",         marker_end)
 	ini_write_real_clean("preferences", "show_layer_volumes", realvolume)
 	ini_write_real_clean("preferences", "use_stereo",         realstereo)
-	ini_write_real_clean("preferences", "loop_to_bar_end",    looptobarend)
+	//ini_write_real_clean("preferences", "loop_to_bar_end",    looptobarend)
 	ini_write_real_clean("preferences", "show_soundcount",    show_soundcount)
 	ini_write_real_clean("preferences", "use_bpm",            use_bpm)
 	ini_write_real_clean("preferences", "save_version",       save_version)