1 files changed, 23 insertions, 24 deletions
diff --git a/client/scripts/map.gd b/client/scripts/map.gd
index 8229bb0d..685c1d69 100644
--- a/client/scripts/map.gd
+++ b/client/scripts/map.gd
@@ -5,49 +5,48 @@ func _ready():
 
 func update(pos, tile_name, neighbors):
 	var instance: Floor
+	var node_name = str(pos)
+
+	if has_node(node_name):
+		queue_free_rename(get_node(node_name))
+
 	match tile_name:
 		"trash":
-			instance = Trash.new()
+			instance = Trash.new(node_name, neighbors)
 		"tomato-crate":
-			instance = CounterBase.new()
+			instance = CounterBase.new(node_name, neighbors)
 		"cuttingboard":
-			instance = CuttingBoard.new()
+			instance = CuttingBoard.new(node_name, neighbors)
 		"counter":
-			instance = CounterBase.new()
+			instance = CounterBase.new(node_name, neighbors)
 		"flour-crate":
-			instance = CounterBase.new()
+			instance = CounterBase.new(node_name, neighbors)
 		"oven":
-			instance = Oven.new()
+			instance = Oven.new(node_name, neighbors)
 		"raw-steak-crate":
-			instance = CounterBase.new()
+			instance = CounterBase.new(node_name, neighbors)
 		"stove":
-			instance = Stove.new()
+			instance = Stove.new(node_name, neighbors)
 		"sink":
-			instance = Sink.new()
+			instance = Sink.new(node_name, neighbors)
 		"dirty-plate-crate":
-			instance = CounterBase.new()
+			instance = CounterBase.new(node_name, neighbors)
 		"wall":
-			instance = Wall.new()
+			instance = Wall.new(node_name, neighbors)
 		"chair":
-			instance = Chair.new()
+			instance = Chair.new(node_name, neighbors)
 		"table":
-			instance = Table.new()
+			instance = Table.new(node_name, neighbors)
 		"floor":
-			instance = Floor.new()
+			instance = Floor.new(node_name, neighbors)
 		"window":
-			instance = Wall.new()
+			instance = WallWindow.new(node_name, neighbors)
 		"door":
-			instance = Door.new()
+			instance = Door.new(node_name, neighbors)
 		var t:
 			push_error("tile tile %s unknown" % t)
-			instance = Floor.new()
-		
-	var node_name = str(pos)
-	
-	if has_node(node_name):
-		queue_free_rename(get_node(node_name))
-	
-	instance.setup(node_name, neighbors)
+			instance = Floor.new(node_name, neighbors)
+
 	instance.position = Vector3(pos[0], 0, pos[1])
 	add_child(instance)