Browse Source

[WIP] Add matchmaking

master
Luna 7 years ago
parent
commit
7b12180695
2 changed files with 4 additions and 9 deletions
  1. +3
    -1
      scripts/menu.gd
  2. +1
    -8
      scripts/networking.gd

+ 3
- 1
scripts/menu.gd View File

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


+ 1
- 8
scripts/networking.gd View File

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


Loading…
Cancel
Save