diff options
Diffstat (limited to 'client/scripts/game.gd')
| -rw-r--r-- | client/scripts/game.gd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/scripts/game.gd b/client/scripts/game.gd index 1c966fa6..ff90065e 100644 --- a/client/scripts/game.gd +++ b/client/scripts/game.gd @@ -3,7 +3,7 @@ extends Node3D @onready var camera: FollowCamera = $FollowCamera @onready var map: Map = $Map -@onready var marker: Node3D = $Marker +@onready var marker: Marker = $Marker var marker_target = Vector3(0,0,0) var players := {} @@ -13,13 +13,13 @@ func _ready(): if Multiplayer.player_id == -1: push_error("multiplayer has not been initialized") Multiplayer.connect("add_player", - func(player: int, name: String, pos: Vector2, character: int): + func(player: int, player_name: String, pos: Vector2, character: int): var player_instance: Player if player == Multiplayer.player_id: - player_instance = ControllablePlayer.new(player, name, pos, character, self) + player_instance = ControllablePlayer.new(player, player_name, pos, character, self) camera.target = player_instance else: - player_instance = Player.new(player, name, pos, character, self) + player_instance = Player.new(player, player_name, pos, character, self) players[player] = player_instance add_child(player_instance) ) |