Merge branch 'pr/477' into development

Author: Bentroen

scripts/control_draw/control_draw.gml

@@ -88,7 +88,10 @@ function control_draw() {
 	// Autosave
 	if (autosave && filename_ext(filename) = ".nbs") {
 	    tonextsave -= 1 / room_speed / 60
-	    if (tonextsave <= 0 && playing == 0) save_song(filename, true)
+	    if (tonextsave <= 0 && playing == 0) {
+			tonextsave = autosavemins
+			save_song(filename, true)
+		}
 	}
 
 	// Auto-recovery

scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_arpeggio() {
 	// draw_window_macro_arpeggio()
 	var x1, y1, a, i, pattern, str, total_vals, val, arplen
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 80) + windowoffset
 	draw_window(x1, y1, x1 + 140, y1 + 130)

scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_portamento() {
 	// draw_window_portamento()
 	var x1, y1, a, b, str, total_vals, val, decr, inc;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 80) + windowoffset
 	draw_window(x1, y1, x1 + 140, y1 + 130)

scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_setpanning() {
 	// draw_window_setpanning()
 	var x1, y1, a, b, str, total_vals, val, decr, inc;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 80) + windowoffset
 	draw_window(x1, y1, x1 + 140, y1 + 130)

scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_setpitch() {
 	// draw_window_setpanning()
 	var x1, y1, a, b, str, total_vals, val, decr, inc;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 80) + windowoffset
 	draw_window(x1, y1, x1 + 140, y1 + 130)

scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_setvelocity() {
 	// draw_window_setvelocity()
 	var x1, y1, a, b, str, total_vals, val, decr, inc;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 80) + windowoffset
 	draw_window(x1, y1, x1 + 140, y1 + 130)

scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_stagger() {
 	// draw_window_macro_stagger()
 	var x1, y1, a, b, i, pattern, str, total_vals, val, arplen, maxlength, conf;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 70) + windowoffset
 	draw_window(x1, y1, x1 + 150, y1 + 160)

scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_stereo() {
 	// draw_window_stereo_macro()
 	var x1, y1, a, b, str, total_vals, val;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 80)
 	y1 = floor(rh / 2 - 80) + windowoffset
 	draw_window(x1, y1, x1 + 140, y1 + 130)

scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml

@@ -1,11 +1,14 @@
 function draw_window_macro_tremolo() {
 	// draw_window_macro_tremolo()
 	var x1, y1;
+	if (selected == 0) {
+		window = 0
+		return 0
+	}
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
 	text_exists[0] = 0
-	if (selected = 0) return 0
 	x1 = floor(rw / 2 - 72)
 	y1 = floor(rh / 2 - 145) + windowoffset
 	draw_window(x1, y1, x1 + 150, y1 + 240)

scripts/selection_compress/selection_compress.gml

@@ -1,59 +1,47 @@
 function selection_compress() {
 	// selection_compress()
-	var str, nw, nh, na, nb, temp_colfirst, temp_collast, temp_exists, temp_ins, temp_key, temp_vel, temp_pan, temp_pit, temp_played;
+	var a, b, str, nw, nh, na, nb, temp_colfirst, temp_collast, temp_exists, temp_ins, temp_key, temp_vel, temp_pan, temp_pit, temp_played;
 	str = selection_code
 	if (selected = 0 || selection_l = 1) return 0
 	nw = 0
-	nh = selection_h - 1
-	/*if (nw > selection_arraylength) { // New length
-	    for (a = selection_arraylength + 1 a <= nw a += 1) {
-	        selection_colfirst[a] = -1
-	        selection_collast[a] = -1
-	        for (b = 0 b <= selection_arrayheight b += 1) {
-	            selection_exists[a, b] = 0
-	        }
-	    }
-	    selection_arraylength = nw
-	}*/
+	nh = 0
 	for (a = 0; a < selection_l; a += 1) {
 	    temp_colfirst[a] = -1
 	    temp_collast[a] = -1
 	    if (selection_colfirst[a] > -1) {
 	        for (b = selection_colfirst[a]; b <= selection_collast[a]; b += 1) {
 	            if (selection_exists[a, b]) {
-	                na = floor(a / 2)
+	                na = a
 	                nb = b
-	                if (a = 0) { // First column, don't change anything
-	                    temp_exists[a, b] = 1
-	                    temp_ins[a, b] = selection_ins[a, b]
-	                    temp_key[a, b] = selection_key[a, b]
-	                    temp_vel[a, b] = selection_vel[a, b]
-	                    temp_pan[a, b] = selection_pan[a, b]
-	                    temp_pit[a, b] = selection_pit[a, b]
-	                    temp_played[a, b] = selection_played[a, b]
+	                if (a == 0) { // First column, don't change anything
 	                } else {
-	                    while (1) { // Check if taken
-	                        if (nb > temp_collast[na]) break
-	                        if (temp_exists[na, nb] = 0) break
+						na = floor(a / 2)
+						while (nb <= temp_collast[na]) { // Check if taken
+	                        if (temp_exists[na, nb] == 0) break
 	                        nb += 1
 	                    }
-	                    temp_exists[na, nb] = 1
-	                    temp_ins[na, nb] = selection_ins[a, b]
-	                    temp_key[na, nb] = selection_key[a, b]
-	                    temp_vel[na, nb] = selection_vel[a, b]
-	                    temp_pan[na, nb] = selection_pan[a, b]
-	                    temp_pit[na, nb] = selection_pit[a, b]
-	                    temp_played[na, nb] = selection_played[a, b]
-	                }
-	                if (temp_colfirst[na] = -1) temp_colfirst[na] = nb
-	                temp_collast[na] = max(temp_collast[na], nb)
-	                selection_exists[a, b] = 0
+					}
+	                temp_exists[na, nb] = 1
+	                temp_ins[na, nb] = selection_ins[a, b]
+	                temp_key[na, nb] = selection_key[a, b]
+	                temp_vel[na, nb] = selection_vel[a, b]
+	                temp_pan[na, nb] = selection_pan[a, b]
+	                temp_pit[na, nb] = selection_pit[a, b]
+	                temp_played[na, nb] = selection_played[a, b]
+					selection_exists[a, b] = 0
 	                selection_ins[a, b] = 0
 	                selection_key[a, b] = 0
 	                selection_vel[a, b] = 0
 	                selection_pan[a, b] = 0
 	                selection_pit[a, b] = 0
 	                selection_played[a, b] = 0
+					
+					if (temp_colfirst[na] == -1) {
+						temp_colfirst[na] = nb
+					} else { // A shifted note can be the first note in the new column
+						temp_colfirst[na] = min(temp_colfirst[na], nb)
+					}
+	                temp_collast[na] = max(temp_collast[na], nb)
 	                nw = max(nw, na)
 	                nh = max(nh, nb)
 	            } else {
@@ -64,6 +52,7 @@ function selection_compress() {
 	    selection_colfirst[a] = -1
 	    selection_collast[a] = -1
 	}
+	selection_extend_height(nh + 1) // Fix #44
 	for (a = 0; a <= nw; a += 1) {
 	    if (temp_colfirst[a] > -1) {
 	        for (b = temp_colfirst[a]; b <= temp_collast[a]; b += 1) {