aboutsummaryrefslogtreecommitdiff
path: root/client/game.gd
diff options
context:
space:
mode:
Diffstat (limited to 'client/game.gd')
-rw-r--r--client/game.gd8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/game.gd b/client/game.gd
index e516615a..5b0062f9 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -113,13 +113,13 @@ func handle_packet(p):
"add_player":
var player_instance: Player
if p.id == player_id:
- player_instance = ControllablePlayer.new(p.id, p.name, p.position, p.character, self)
+ player_instance = ControllablePlayer.new(p.id, p.name, p.position, p.character, p.class, self)
in_lobby_updated.connect(player_instance.onscreen_controls.in_lobby_updated)
player_instance.onscreen_controls.in_lobby_updated(in_lobby)
camera.target = player_instance.movement_base
set_join_state(JoinState.JOINED)
else:
- player_instance = Player.new(p.id, p.name, p.position, p.character, self)
+ player_instance = Player.new(p.id, p.name, p.position, p.character, p.class, self)
players[p.id] = player_instance
add_child(player_instance)
update_players.emit(players)
@@ -361,7 +361,7 @@ func toggle_join():
match join_state:
JoinState.SPECTATING:
set_join_state(JoinState.WAITING)
- mp.send_join(Global.get_profile("username"), Global.get_profile("character"))
+ mp.send_join(Global.get_profile("username"), Global.get_profile("character_style"))
JoinState.WAITING:
push_error("Join/Leave action already toggled.")
JoinState.JOINED:
@@ -412,7 +412,7 @@ func spectate_center():
var player_center: Vector3 = Vector3(0.,0.,0.)
for v in players.values():
var p: Player = v
- if p.character_idx >= 0:
+ if !p.is_customer:
player_sum += 1
player_center += p.movement_base.position
sum += 1