diff options
Diffstat (limited to 'Game/Network.gd')
-rw-r--r-- | Game/Network.gd | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/Game/Network.gd b/Game/Network.gd index 4413548..345b305 100644 --- a/Game/Network.gd +++ b/Game/Network.gd @@ -62,14 +62,6 @@ func _on_peer_connected(id: int): print(multiplayer.get_unique_id(), ": peer connected: ", id) add_to_players.rpc_id(id, inst_to_dict(Client.player)) - # TODO: check why bug and adds more players than intended - #ask_game_running.rpc_id(id) - #is_game_running.connect(func(is_running: bool): - #if not is_running: - #add_to_players.rpc_id(id, inst_to_dict(Client.player)) - #elif is_running: - #get_tree().change_scene_to_file("res://UI/Start.tscn") - #) func _on_peer_disconnected(id: int): print(multiplayer.get_unique_id(), ": peer disconnected: ", id) @@ -113,18 +105,6 @@ func remove_player(id: int): players_changed.emit() -signal is_game_running(is_running: bool) - -@rpc("any_peer") -func ask_game_running(): - var is_running = get_tree().current_scene is Stage - receive_game_running.rpc_id(multiplayer.get_remote_sender_id(), is_running) - -@rpc("any_peer") -func receive_game_running(is_running: bool): - is_game_running.emit(is_running) - - @rpc("any_peer") func add_to_players(remote_data: Dictionary): var id = multiplayer.get_remote_sender_id() @@ -152,7 +132,7 @@ func update_player(id: int, remote_data: Dictionary): players_changed.emit() -@rpc("any_peer") +@rpc("any_peer", "call_remote") func destroy_tower(remote_data: Dictionary): var data: Tower.NetworkData = dict_to_inst(remote_data) var remote_tower = Tower.from_network_data(data) @@ -163,7 +143,7 @@ func destroy_tower(remote_data: Dictionary): Client.current_stage.destroy_tower(tower) -@rpc("any_peer") +@rpc("any_peer", "call_remote") func update_tower(remote_tower_node_path: NodePath, remote_data: Dictionary): var data: Tower.NetworkData = dict_to_inst(remote_data) var tower: Tower = get_tree().current_scene.get_node_or_null(remote_tower_node_path) @@ -172,14 +152,14 @@ func update_tower(remote_tower_node_path: NodePath, remote_data: Dictionary): tower.update_with_network_data(data) -@rpc("any_peer") +@rpc("any_peer", "call_remote") func remove_unit(remote_unit_node_path: NodePath): var unit = get_tree().current_scene.get_node_or_null(remote_unit_node_path) if unit: unit.queue_free() -@rpc("any_peer") +@rpc("any_peer", "call_remote") func update_unit(remote_unit_node_path: NodePath, remote_data: Dictionary): var data: Unit.NetworkData = dict_to_inst(remote_data) var unit: Unit = get_tree().current_scene.get_node_or_null(remote_unit_node_path) |