diff --git a/scripts/globals/networker.gd b/scripts/globals/networker.gd index 938e5e8..589f641 100644 --- a/scripts/globals/networker.gd +++ b/scripts/globals/networker.gd @@ -93,6 +93,13 @@ func is_dedicated_server() -> bool: return OS.has_feature("dedicated_server") or DisplayServer.get_name() == "headless" +func player_name(peer_id: int) -> String: + if peer_id in players: + return str(peer_id) + " (" + players[peer_id]["name"] + ")" + + return str(peer_id) + + func _switch_scene(from: Node, to: PackedScene) -> void: if from: from.queue_free() @@ -111,7 +118,7 @@ func _add_player(peer_id: int, player_info: Dictionary) -> void: if not multiplayer.is_server(): return - print("Adding player ", peer_id) + print("Adding player ", player_name(peer_id)) var player := _player_scene.instantiate() as Player player.name = str(peer_id) @@ -123,7 +130,7 @@ func _remove_player(peer_id: int) -> void: if not multiplayer.is_server(): return - print("Removing player ", peer_id, " ", players[peer_id]["name"]) + print("Removing player ", player_name(peer_id)) var player := Referencer.main.player_holder.get_node_or_null(str(peer_id)) if player: player.queue_free() @@ -147,7 +154,7 @@ func _on_multiplayer_peer_connected(peer_id: int) -> void: func _on_multiplayer_peer_disconnected(peer_id: int) -> void: - print("Peer disconnected ", peer_id, " ", players[peer_id]["name"]) + print("Peer disconnected ", player_name(peer_id)) _remove_player(peer_id) players.erase(peer_id) diff --git a/scripts/main.gd b/scripts/main.gd index d988e12..4ea22bc 100644 --- a/scripts/main.gd +++ b/scripts/main.gd @@ -25,7 +25,7 @@ func _on_player_spawner_spawned(node: Node) -> void: return var player := node as Player - print("Spawned player ", player.name) + print("Spawned player ", Networker.player_name(int(str(player.name)))) func _on_player_spawner_despawned(node: Node) -> void: @@ -33,4 +33,4 @@ func _on_player_spawner_despawned(node: Node) -> void: return var player := node as Player - print("Despawned player ", player.name) + print("Despawned player ", Networker.player_name(int(str(player.name)))) diff --git a/scripts/player.gd b/scripts/player.gd index 834015b..afd0634 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -28,7 +28,7 @@ var _default_camera_height: float func _enter_tree() -> void: _peer_id = str(name).to_int() - print("Player ", _peer_id, " enter tree") + print("Player ", Networker.player_name(_peer_id), " enter tree") set_multiplayer_authority(_peer_id) @@ -42,11 +42,11 @@ func _ready() -> void: _camera.make_current() Referencer.player = self Referencer.camera = _camera - print("Player ", _peer_id, " ready authority") + print("Player ", Networker.player_name(_peer_id), " ready authority") func _exit_tree() -> void: - print("Player ", _peer_id, " exit tree") + print("Player ", Networker.player_name(_peer_id), " exit tree") if Networker.is_active() and not is_multiplayer_authority(): return