Browse Source

Use global server ip for reconnect

master
Luna 7 years ago
parent
commit
851014b219
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      scripts/matchmaking.gd
  2. +2
    -2
      scripts/menu.gd
  3. +2
    -2
      scripts/networking.gd

+ 2
- 2
scripts/matchmaking.gd View File

@ -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):


+ 2
- 2
scripts/menu.gd View File

@ -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)


+ 2
- 2
scripts/networking.gd View File

@ -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()


Loading…
Cancel
Save