From 7b12180695f4a170b86a3b32cc068d2c4a5a3a63 Mon Sep 17 00:00:00 2001 From: Luna Date: Sun, 20 May 2018 16:56:25 -0400 Subject: [PATCH] [WIP] Add matchmaking --- scripts/menu.gd | 4 +++- scripts/networking.gd | 9 +-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/menu.gd b/scripts/menu.gd index 55cab18..2d4d1d6 100644 --- a/scripts/menu.gd +++ b/scripts/menu.gd @@ -13,7 +13,9 @@ func _gui_setup(): get_node("Center/Singleplayer").connect("pressed", self, "_singleplayer") func _find_game(): - print("still refactoring matchmaker") + var ip = networking.global_server_ip + var port = networking.matchmaking.MATCHMAKING_PORT + networking.start_client(ip, port) func _custom_game(): get_tree().change_scene("res://scenes/custom_game.tscn") diff --git a/scripts/networking.gd b/scripts/networking.gd index b092f9c..878bb35 100644 --- a/scripts/networking.gd +++ b/scripts/networking.gd @@ -27,6 +27,7 @@ func _ready(): func start_client(ip="", port=0): if not ip: ip = util.args.get_value("-ip") + ip = IP.resolve_hostname(ip) if not port: port = util.args.get_value("-port") var peer = NetworkedMultiplayerENet.new() @@ -34,14 +35,6 @@ func start_client(ip="", port=0): peer.create_client(ip, port) get_tree().set_network_peer(peer) -# func singleplayer_init(): TODO -# # collect_info() TODO -# var peer = NetworkedMultiplayerENet.new() -# peer.create_server(port, 1) -# get_tree().set_network_peer(peer) -# players[1] = my_info -# start_game() - func _connect_to_matchmaker(game_port): var matchmaker_peer = StreamPeerTCP.new() matchmaker_peer.connect_to_host("127.0.0.1", matchmaking.SERVER_TO_SERVER_PORT)