summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authortpart <tpart120@proton.me>2025-06-16 21:38:38 +0200
committertpart <tpart120@proton.me>2025-06-16 21:38:38 +0200
commit4dbfbaed68390340361bb00f202debc4d04f978d (patch)
treeee9cb8ea4cf6e9228a80bf52c0c12aa71e539918 /client
parent06732a583a5dd1c4309d1eaecb31b58dcc618fca (diff)
downloadhurrycurry-4dbfbaed68390340361bb00f202debc4d04f978d.tar
hurrycurry-4dbfbaed68390340361bb00f202debc4d04f978d.tar.bz2
hurrycurry-4dbfbaed68390340361bb00f202debc4d04f978d.tar.zst
Fix: Variable declared twice under different names
Diffstat (limited to 'client')
-rw-r--r--client/game.gd9
1 files changed, 4 insertions, 5 deletions
diff --git a/client/game.gd b/client/game.gd
index d4e3d852..c112eb37 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -67,7 +67,6 @@ var players := {}
var spectating_mode: SpectatingMode = SpectatingMode.CENTER
-@onready var camera: FollowCamera = $FollowCamera
@onready var mp: Multiplayer = $Multiplayer
@onready var map: Map = $Map
@onready var lobby: Lobby = $"../Lobby"
@@ -116,8 +115,8 @@ func handle_packet(p):
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
- camera.reset()
+ follow_camera.target = player_instance.movement_base
+ follow_camera.reset()
set_join_state(JoinState.JOINED)
else:
player_instance = Player.new(p.id, p.name, p.position, p.character, p.class, self)
@@ -133,7 +132,7 @@ func handle_packet(p):
pinned_items.clear_item(p.id)
if p.id == player_id:
set_join_state(JoinState.SPECTATING)
- camera.target = $Center
+ follow_camera.target = $Center
for h in player.hand:
if h != null:
h.queue_free()
@@ -453,7 +452,7 @@ func spectate_center():
func spectate_free():
var direction := Input.get_vector("left", "right", "forwards", "backwards")
- direction = direction.rotated(-camera.angle_target)
+ direction = direction.rotated(-follow_camera.angle_target)
$Center.position += Vector3(
direction.x,
$Center.position.y,