bugfix: Fix the selection being duplicated when undoing a macro operation

- The text "(CANNOT BE UNDONE)" is changed to "(CAN BE UNDONE)"

Author: IoeCmcomc

scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml

@@ -12,9 +12,9 @@ function draw_window_macro_stagger() {
 	draw_theme_color()
 	draw_theme_font(font_main_bold)
 	draw_text_dynamic(x1 + 8, y1 + 8, "Stagger")
-	draw_set_color(c_red)
-	if (language != 1) draw_text_dynamic(x1 + 8, y1 + 23, "(CANNOT BE UNDONE)")
-	else draw_text_dynamic(x1 + 8, y1 + 23, "（无法还原！！）")
+	draw_set_color(c_green)
+	if (language != 1) draw_text_dynamic(x1 + 8, y1 + 23, "(CAN BE UNDONE)")
+	else draw_text_dynamic(x1 + 8, y1 + 23, "（无法还原！！）") // Please re-translate this
 	draw_theme_color()
 	pattern = ""
 	draw_theme_font(font_main)
@@ -87,7 +87,10 @@ function draw_window_macro_stagger() {
 		if val >= total_vals break
 		}
 		var new_str = array_to_selection(arr_data, total_vals)
-		selection_load(selection_x, selection_y, new_str, true)
+		var sel_x = selection_x
+		var sel_y = selection_y
+		selection_delete(true)
+		selection_load_ext(sel_x, sel_y, new_str)
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}

scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml

@@ -1,6 +1,6 @@
 function draw_window_macro_tremolo() {
 	// draw_window_macro_tremolo()
-	var x1, y1, a, i, pattern, str, total_vals, val;
+	var x1, y1;
 	windowanim = 1
 	if (theme = 3) draw_set_alpha(windowalpha)
 	curs = cr_default
@@ -11,9 +11,9 @@ function draw_window_macro_tremolo() {
 	draw_window(x1, y1, x1 + 150, y1 + 240)
 	draw_theme_font(font_main_bold)
 	draw_text_dynamic(x1 + 8, y1 + 8, "Tremolo")
-	draw_set_color(c_red)
-	if (language != 1) draw_text_dynamic(x1 + 8, y1 + 23, "(CANNOT BE UNDONE)")
-	else draw_text_dynamic(x1 + 8, y1 + 23, "（无法还原！！）")
+	draw_set_color(c_green)
+	if (language != 1) draw_text_dynamic(x1 + 8, y1 + 23, "(CAN BE UNDONE)")
+	else draw_text_dynamic(x1 + 8, y1 + 23, "（无法还原！！）") // Please re-translate this
 	draw_theme_color()
 	draw_theme_font(font_main)
 	if (theme = 0) {
@@ -68,8 +68,8 @@ function draw_window_macro_tremolo() {
 			return 1
 		}
 		if tremolotype = 0 macro_tremolo()
-		if tremolotype = 1 macro_tremolo_fadein()
-		if tremolotype = 2 macro_tremolo_fadeout()
+		else if tremolotype = 1 macro_tremolo_fadein()
+		else if tremolotype = 2 macro_tremolo_fadeout()
 		windowalpha = 0
 		windowclose = 0
 		windowopen = 0

scripts/macro_tremolo/macro_tremolo.gml

@@ -9,6 +9,8 @@ function macro_tremolo() {
 	total_cols = macro_column_count(arr_temp)
 	//show_debug_message("total cols is "+string(total_cols))
 	val = 0
+	var arr_data = []
+	var arr_col = []
 	c = 0
 	colcount = 0
 	for (d = 0; d < total_cols; d++;) {
@@ -47,7 +49,10 @@ function macro_tremolo() {
 	arr_data[0] = 0
 	//show_debug_message("Out of loop. arr_data has been changed to " + string(array_to_selection(arr_data, c)))
 	var new_str = array_to_selection(arr_data, array_length(arr_data))
-	selection_load(selection_x, selection_y, new_str, true)
+	var sel_x = selection_x
+	var sel_y = selection_y
+	selection_delete(true)
+	selection_load_ext(sel_x, sel_y, new_str)
 	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
 	if(!keyboard_check(vk_alt)) selection_place(false)
 

scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml

@@ -9,6 +9,8 @@ function macro_tremolo_fadein() {
 	total_cols = macro_column_count(arr_temp)
 	//show_debug_message("total cols is "+string(total_cols))
 	val = 0
+	var arr_data = []
+	var arr_col = []
 	c = 0
 	colcount = 0
 	prevlength = 0
@@ -81,8 +83,10 @@ function macro_tremolo_fadein() {
 	arr_data[0] = 0
 	//show_debug_message("Out of loop. arr_data has been changed to " + string(array_to_selection(arr_data, c)))
 	var new_str = array_to_selection(arr_data, c)
-	arr_data = 0
-	selection_load(selection_x, selection_y, new_str, true)
+	var sel_x = selection_x
+	var sel_y = selection_y
+	selection_delete(true)
+	selection_load_ext(sel_x, sel_y, new_str)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 

scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml

@@ -9,6 +9,8 @@ function macro_tremolo_fadeout() {
 	total_cols = macro_column_count(arr_temp)
 	//show_debug_message("total cols is "+string(total_cols))
 	val = 0
+	var arr_data = []
+	var arr_col = []
 	c = 0
 	colcount = 0
 	prevlength = 0
@@ -78,8 +80,10 @@ function macro_tremolo_fadeout() {
 	arr_data[0] = 0
 	//show_debug_message("Out of loop. arr_data has been changed to " + string(array_to_selection(arr_data, c)))
 	var new_str = array_to_selection(arr_data, c)
-	arr_data = 0
-	selection_load(selection_x, selection_y, new_str, true)
+	var sel_x = selection_x
+	var sel_y = selection_y
+	selection_delete(true)
+	selection_load_ext(sel_x, sel_y, new_str)
 	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
 	if(!keyboard_check(vk_alt)) selection_place(false)
 

scripts/remove_block_select/remove_block_select.gml

@@ -4,7 +4,7 @@ function remove_block_select(argument0, argument1) {
 	xx = argument0
 	yy = argument1
 
-	if (song_exists[xx, yy] = 0) return 0
+	if (xx >= arraylength || yy >= arrayheight || song_exists[xx, yy] == 0) return 0
 	song_exists[xx, yy] = 0
 	song_ins[xx, yy].num_blocks--
 	if (song_key[xx, yy] < 33 || song_key[xx, yy] > 57) block_outside -= 1