network work work workHEADmaster

5 files changed, 11 insertions, 30 deletions

diff --git a/godot/ui/HUD.gd b/godot/ui/HUD.gd
index cfef629..7fe964c 100644
--- a/godot/ui/HUD.gd
+++ b/godot/ui/HUD.gd
@@ -99,8 +99,8 @@ func update_characters():
 func _ui_disconnect():
 	get_tree().get_root().get_node("GAMEWORLD").client_disconnect()
 
-func ui_join_red():
-	world.join_team("RED")
+func ui_join_team(team_i):
+	world.join_team(team_i)
 
 func ui_join_blue():
 	world.join_team("BLUE")
diff --git a/godot/ui/HUD.tscn b/godot/ui/HUD.tscn
index 0c1538f..af3afa3 100644
--- a/godot/ui/HUD.tscn
+++ b/godot/ui/HUD.tscn
@@ -232,7 +232,7 @@ margin_bottom = 11.0
 max_value = 1.0
 percent_visible = false
 
-[connection signal="pressed" from="ServerJoinMenu/JoinTeam1" to="." method="ui_join_red"]
-[connection signal="pressed" from="ServerJoinMenu/JoinTeam2" to="." method="ui_join_blue"]
+[connection signal="pressed" from="ServerJoinMenu/JoinTeam1" to="." method="ui_join_team" binds= [ 0 ]]
+[connection signal="pressed" from="ServerJoinMenu/JoinTeam2" to="." method="ui_join_team" binds= [ 1 ]]
 [connection signal="pressed" from="ServerJoinMenu/Disconnect" to="." method="_ui_disconnect"]
 [connection signal="text_entered" from="ChatPrompt" to="." method="send_chat_msg"]
diff --git a/godot/ui/MainMenu.gd b/godot/ui/MainMenu.gd
index 0b49b36..c84b16c 100644
--- a/godot/ui/MainMenu.gd
+++ b/godot/ui/MainMenu.gd
@@ -27,7 +27,8 @@ func _ready():
 		
 		server = preload("res://scenes/Server.tscn").instance()
 		#server.start_server($ServerName.text, $MOTD.text, $PlayerCount.value, $MapPath.text, $IP.text, $Port.value, get_tree(), console, "add_line")
-		server.start_server("Dedicated Server", "Dedicated Multiplayer Server", 3, "res://maps/Main.tscn", "127.0.0.1", 25565, get_tree(), null, "print")
+		server.start_server("Dedicated Server", "Dedicated Multiplayer Server", 3, "res://maps/Main.tscn", false, 25565, get_tree(), null, "print")
+		server.world.visible= false
 		get_tree().get_root().set_update_mode(Viewport.UPDATE_DISABLED)
 		Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
 		
@@ -53,20 +54,10 @@ func to_join_menu():
 	queue_free()
 
 func run_local_server():
-	local_server_tree = SceneTree.new()
-	local_server_tree.init()
-	local_server_tree.get_root().set_update_mode(Viewport.UPDATE_DISABLED)
 	var server_script = preload("res://scenes/Server.tscn").instance()
-
 	#CHANGE LEVEL HERE
-	server_script.start_server("Local Server", "Local Singleplayer Server", 3, "res://maps/Main.tscn", "127.0.0.1", 25565, local_server_tree, null, "print")
-	set_process(true)
-	set_physics_process(true)
-	client = NetworkedMultiplayerENet.new()
-	var cli_stat = client.create_client("127.0.0.1", 25565)
-	if cli_stat != OK:
-		print("Error creating client. Code: " + str(cli_stat))
-	get_tree().set_network_peer(client)
+	server_script.start_server("Local Server", "Local Singleplayer Server", 3, "res://maps/Main.tscn", true, 25565, get_tree(), null, "print")
+	queue_free()
 
 func _local_connection_failed():
 	pass
diff --git a/godot/ui/clientmenu/ClientUI.gd b/godot/ui/clientmenu/ClientUI.gd
index af80e36..c0f9681 100644
--- a/godot/ui/clientmenu/ClientUI.gd
+++ b/godot/ui/clientmenu/ClientUI.gd
@@ -35,21 +35,11 @@ func _connection_successful():
 	queue_free()
 
 func _run_local_server():
-	local_server_tree = SceneTree.new()
-	local_server_tree.init()
-	local_server_tree.get_root().set_update_mode(Viewport.UPDATE_DISABLED)
 	var server_script = preload("res://scenes/Server.tscn").instance()
 
 	#CHANGE LEVEL HERE
-	server_script.start_server("Local Server", "Local Singleplayer Server", 3, "res://maps/Main.tscn", "127.0.0.1", 25565, local_server_tree, null, "print")
-	set_process(true)
-	set_physics_process(true)
-	is_local = true
-	client = NetworkedMultiplayerENet.new()
-	var cli_stat = client.create_client("127.0.0.1", 25565)
-	if cli_stat != OK:
-		print("Error creating client. Code: " + str(cli_stat))
-	get_tree().set_network_peer(client)
+	server_script.start_server("Local Server", "Local Singleplayer Server", 3, "res://maps/Main.tscn", true, 25565, get_tree(), null, "print")
+	queue_free()
 
 func back_to_main():
 	var main_menu = load("res://ui/MainMenu.tscn").instance()
diff --git a/godot/ui/servermenu/ServerUI.gd b/godot/ui/servermenu/ServerUI.gd
index 9deca37..a06d426 100644
--- a/godot/ui/servermenu/ServerUI.gd
+++ b/godot/ui/servermenu/ServerUI.gd
@@ -30,7 +30,7 @@ func start_server():
 	
 	server = preload("res://scenes/Server.tscn").instance()
 	$CmdPrompt.server_ref = server
-	server.start_server($ServerName.text, $MOTD.text, $PlayerCount.value, $MapPath.text, $IP.text, $Port.value, get_tree(), console, "add_line")
+	server.start_server($ServerName.text, $MOTD.text, $PlayerCount.value, $MapPath.text, false, $Port.value, get_tree(), console, "add_line")
 	
 	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
 	hide_init_fields()