Merge pull request #116 from TheSecondReal0/map-system-2-electric-boo…

…galoo Improve map info storage
opensuspect · Oct 19, 2020 · d3778ac · d3778ac
2 parents 3994905 + 3d5d3fd
commit d3778ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/assets/main/main.gd b/src/assets/main/main.gd
@@ -8,7 +8,7 @@ var player_scene = load(player_s)
 var players = {}
 #!!!THIS IS IMPORTANT!!!
 #INCREASE THIS VARIABLE BY ONE EVERY COMMIT TO PREVENT OLD CLIENTS FROM TRYING TO CONNECT TO SERVERS!!!
-var version = 4
+var version = 5
 var intruders = 0
 var errdc = false
 onready var config = ConfigFile.new()

diff --git a/src/assets/main/maps.gd b/src/assets/main/maps.gd
@@ -1,6 +1,6 @@
 extends Node2D
 
-var maps: Dictionary = {"lobby": preload("res://assets/maps/lobby/lobby.tscn"), "test": preload("res://assets/maps/test/test.tscn")}
+var maps: Dictionary = {"lobby": {"dir": preload("res://assets/maps/lobby/lobby.tscn")}, "test": {"dir": preload("res://assets/maps/test/test.tscn")}}
 
 var currentMap: String = "lobby"
 
@@ -21,5 +21,5 @@ puppet func switchMap(newMap: String):
 	for i in get_children():
 		i.queue_free()
 	currentMap = newMap
-	var mapClone = maps[newMap].instance()
+	var mapClone = maps[newMap].dir.instance()
 	add_child(mapClone)