From 851014b2192b6692572bccdfec22ec6a5f34b390 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 26 May 2018 16:53:00 -0400 Subject: [PATCH] Use global server ip for reconnect --- scripts/matchmaking.gd | 4 ++-- scripts/menu.gd | 4 ++-- scripts/networking.gd | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/matchmaking.gd b/scripts/matchmaking.gd index 30e3e4f..43ef50a 100644 --- a/scripts/matchmaking.gd +++ b/scripts/matchmaking.gd @@ -4,7 +4,7 @@ var SERVER_TO_SERVER_PORT = 54671 var MATCHMAKING_PORT = 54672 var GAME_SIZE = 6 # Number of games we can make without blowing up the computer -var MAX_GAMES = 50 # Totally random guess +var MAX_GAMES = 50 # Based on how many ports I decided to forward var next_port = 54673 @@ -80,7 +80,7 @@ func queue(netid): # # func add_to_game(netid, port): - networking.rpc_id(netid, "reconnect", port) + networking.rpc_id(netid, "reconnect", networking.global_server_ip, port) func skirmish_to_game(port, count=1): for i in range(count): diff --git a/scripts/menu.gd b/scripts/menu.gd index e11b912..b5d41e3 100644 --- a/scripts/menu.gd +++ b/scripts/menu.gd @@ -14,8 +14,8 @@ func _gui_setup(): get_node("Center/Quit").connect("pressed", get_tree(), "quit") func _find_game(): - # var ip = networking.global_server_ip - var ip = util.args.get_value("-ip") + var ip = networking.global_server_ip + # var ip = util.args.get_value("-ip") var port = networking.matchmaking.MATCHMAKING_PORT networking.start_client(ip, port) diff --git a/scripts/networking.gd b/scripts/networking.gd index a1c12e8..f3be907 100644 --- a/scripts/networking.gd +++ b/scripts/networking.gd @@ -33,10 +33,10 @@ func start_client(ip="", port=0): get_tree().set_network_peer(peer) get_tree().change_scene("res://scenes/lobby.tscn") -remote func reconnect(port): +remote func reconnect(ip, port): # Reset previously known players players = {} - start_client("", port) + start_client(ip, port) func _connect_to_matchmaker(game_port): var matchmaker_peer = StreamPeerTCP.new()