Fix crashing after moving selection under all layers

OctoFlareDev · OctoFlareDev · commit 6ce3ed234220 · 2024-12-14T13:16:46.000+09:00
diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp
diff --git a/scripts/control_draw/control_draw.gml b/scripts/control_draw/control_draw.gml
@@ -528,6 +528,7 @@ function control_draw() {
 	        selection_y = max(0, selection_y)
 	        history_set(h_selectmove, selection_x, selection_y, selection_sx, selection_sy)
 	        window = w_releasemouse
+			selection_expand_layers()
 	    }
 	}
 	if (!isplayer) {
diff --git a/scripts/selection_expand_layers/selection_expand_layers.gml b/scripts/selection_expand_layers/selection_expand_layers.gml
@@ -0,0 +1,12 @@
+function selection_expand_layers(){
+	if (selection_y + selection_h - 1 >= endb2) {
+		for (i = endb2; i < selection_y + selection_h; i++) {
+			layername[i] = ""
+			layerlock[i] = 0
+			layervol[i] = 100
+			layerstereo[i] = 100
+			rowamount[i] = 0
+			endb2 = i + 1
+		}
+	}
+}
diff --git a/scripts/selection_expand_layers/selection_expand_layers.yy b/scripts/selection_expand_layers/selection_expand_layers.yy
diff --git a/scripts/selection_load/selection_load.gml b/scripts/selection_load/selection_load.gml
@@ -63,4 +63,5 @@ function selection_load(argument0, argument1, argument2, argument3) {
 	selection_l = ca + 1
 	selection_h = h + 1
 	selection_code_update()
+	selection_expand_layers()
 }
diff --git a/scripts/selection_load_ext/selection_load_ext.gml b/scripts/selection_load_ext/selection_load_ext.gml
@@ -63,4 +63,5 @@ function selection_load_ext(argument0, argument1, argument2) {
 	selection_l = ca + 1
 	selection_h = h + 1
 	selection_code_update()
+	selection_expand_layers()
 }
diff --git a/scripts/selection_load_from_array/selection_load_from_array.gml b/scripts/selection_load_from_array/selection_load_from_array.gml
@@ -35,4 +35,5 @@ function selection_load_from_array(xx, yy, array){
 	selection_l = ca + 1
 	selection_h = h + 1
 	selection_code_update()
+	selection_expand_layers()
 }

Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,7 @@ function control_draw() {`
`528`	`528`	`selection_y = max(0, selection_y)`
`529`	`529`	`history_set(h_selectmove, selection_x, selection_y, selection_sx, selection_sy)`
`530`	`530`	`window = w_releasemouse`
	`531`	`+ selection_expand_layers()`
`531`	`532`	`}`
`532`	`533`	`}`
`533`	`534`	`if (!isplayer) {`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,5 @@ function selection_load(argument0, argument1, argument2, argument3) {`
`63`	`63`	`selection_l = ca + 1`
`64`	`64`	`selection_h = h + 1`
`65`	`65`	`selection_code_update()`
	`66`	`+ selection_expand_layers()`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ function selection_load_from_array(xx, yy, array){`
`35`	`35`	`selection_l = ca + 1`
`36`	`36`	`selection_h = h + 1`
`37`	`37`	`selection_code_update()`
	`38`	`+ selection_expand_layers()`
`38`	`39`	`}`