teatov/cadastery
1
0
Fork 0
Code Issues Pull Requests Actions Releases 4 Activity

add better player names to logging

Browse Source
This commit is contained in:
Teatov 2025-02-13 21:49:30 +10:00
parent f41c047f26
commit 26fe3ae790
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/globals/networker.gd
View File

@ -93,6 +93,13 @@ func is_dedicated_server() -> bool:
return OS.has_feature("dedicated_server") or DisplayServer.get_name() == "headless" 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: func _switch_scene(from: Node, to: PackedScene) -> void:
if from: if from:
from.queue_free() from.queue_free()
@ -111,7 +118,7 @@ func _add_player(peer_id: int, player_info: Dictionary) -> void:
if not multiplayer.is_server(): if not multiplayer.is_server():
return return
print("Adding player ", peer_id) print("Adding player ", player_name(peer_id))
var player := _player_scene.instantiate() as Player var player := _player_scene.instantiate() as Player
player.name = str(peer_id) player.name = str(peer_id)
@ -123,7 +130,7 @@ func _remove_player(peer_id: int) -> void:
if not multiplayer.is_server(): if not multiplayer.is_server():
return 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)) var player := Referencer.main.player_holder.get_node_or_null(str(peer_id))
if player: if player:
player.queue_free() 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: 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) _remove_player(peer_id)
players.erase(peer_id) players.erase(peer_id)

4
scripts/main.gd
View File

@ -25,7 +25,7 @@ func _on_player_spawner_spawned(node: Node) -> void:
return return
var player := node as Player 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: func _on_player_spawner_despawned(node: Node) -> void:
@ -33,4 +33,4 @@ func _on_player_spawner_despawned(node: Node) -> void:
return return
var player := node as Player var player := node as Player
print("Despawned player ", player.name) print("Despawned player ", Networker.player_name(int(str(player.name))))

6
scripts/player.gd
View File

@ -28,7 +28,7 @@ var _default_camera_height: float
func _enter_tree() -> void: func _enter_tree() -> void:
_peer_id = str(name).to_int() _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) set_multiplayer_authority(_peer_id)
@ -42,11 +42,11 @@ func _ready() -> void:
_camera.make_current() _camera.make_current()
Referencer.player = self Referencer.player = self
Referencer.camera = _camera Referencer.camera = _camera
print("Player ", _peer_id, " ready authority") print("Player ", Networker.player_name(_peer_id), " ready authority")
func _exit_tree() -> void: 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(): if Networker.is_active() and not is_multiplayer_authority():
return return