From a399619b9a20b15a7d6166236e6d9027aeaec478 Mon Sep 17 00:00:00 2001 From: techrunner Date: Thu, 15 Aug 2024 02:04:24 -0500 Subject: [PATCH] Changed openMap function to check if it's a string instead of just doing it --- Assets/scripts/MapLoader.gd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/scripts/MapLoader.gd b/Assets/scripts/MapLoader.gd index b636803..101679a 100644 --- a/Assets/scripts/MapLoader.gd +++ b/Assets/scripts/MapLoader.gd @@ -2,22 +2,22 @@ class_name MapLoader extends Node3D @export var Default_Map:PackedScene -@export var scenes: Array[PackedScene] signal map_loaded var current_map -func openMap(path=GlobalSettings.current_map): - if path is PackedScene: - current_map = path.instantiate() - else: - current_map = load(path).instantiate() +func openMap(new_map=GlobalSettings.current_map): + if new_map is PackedScene: + current_map = new_map.instantiate() + if new_map is String: + current_map = load(new_map).instantiate() add_child(current_map) + emit_signal("map_loaded") func closeMap(): remove_child(current_map) func _init(): - openMap() + openMap() \ No newline at end of file