Prevent lost resources when Godot exits

Portponky · Mar 26, 2024 · 825dd0e · 825dd0e
1 parent 4b9e6ed
commit 825dd0e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/addons/better-terrain/editor/Dock.gd b/addons/better-terrain/editor/Dock.gd
@@ -46,13 +46,6 @@ const TERRAIN_ENTRY_SCENE := preload("res://addons/better-terrain/editor/Terrain
 
 var selected_entry := -2
 
-@onready var terrain_icons := [
-	load("res://addons/better-terrain/icons/MatchTiles.svg"),
-	load("res://addons/better-terrain/icons/MatchVertices.svg"),
-	load("res://addons/better-terrain/icons/NonModifying.svg"),
-	load("res://addons/better-terrain/icons/Decoration.svg"),
-]
-
 var tilemap : TileMap
 var tileset : TileSet
 
@@ -157,6 +150,7 @@ func tiles_changed() -> void:
 	# clear terrains
 	for c in terrain_list.get_children():
 		terrain_list.remove_child(c)
+		c.queue_free()
 
 	# load terrains from tileset
 	var terrain_count := BetterTerrain.terrain_count(tileset)

diff --git a/addons/better-terrain/editor/TerrainEntry.gd b/addons/better-terrain/editor/TerrainEntry.gd
@@ -25,12 +25,6 @@ var _terrain_texture:Texture2D
 var _terrain_texture_rect:Rect2i
 var _icon_draw_connected := false
 
-@onready var terrain_icons := [
-	load("res://addons/better-terrain/icons/MatchTiles.svg"),
-	load("res://addons/better-terrain/icons/MatchVertices.svg"),
-	load("res://addons/better-terrain/icons/NonModifying.svg"),
-	load("res://addons/better-terrain/icons/Decoration.svg"),
-]
 
 func _ready():
 	update()
@@ -84,7 +78,15 @@ func update():
 	color_style_decoration.border_width_top = 4
 	color_style_decoration.border_width_bottom = 4
 
-	type_icon_slot.texture = terrain_icons[terrain.type]
+	match terrain.type:
+		BetterTerrain.TerrainType.MATCH_TILES:
+			type_icon_slot.texture = load("res://addons/better-terrain/icons/MatchTiles.svg")
+		BetterTerrain.TerrainType.MATCH_VERTICES:
+			type_icon_slot.texture = load("res://addons/better-terrain/icons/MatchVertices.svg")
+		BetterTerrain.TerrainType.CATEGORY:
+			type_icon_slot.texture = load("res://addons/better-terrain/icons/NonModifying.svg")
+		BetterTerrain.TerrainType.DECORATION:
+			type_icon_slot.texture = load("res://addons/better-terrain/icons/Decoration.svg")
 
 	var has_icon = false
 	if terrain.has("icon"):